调整

app/pages/declare/add.vue

@@ -25,12 +25,7 @@
 					</u-input>
 				</view>
 			</view>
-			<view class="item">
-				<view class="l"><text style="color: red;">*</text>生产批号：</view>
-				<view class="r">
-					<u-input placeholder="生产批号" @input="handler()" v-model="form.productionCode" />
-				</view>
-			</view>
+
 			<view class="item">
 				<view class="l"><text style="color: red;">*</text>毛重：</view>
 				<view class="r">
@@ -40,9 +35,9 @@
 				</view>
 			</view>
 			<view class="item">
-				<view class="l">数量：</view>
+				<view class="l">件数：</view>
 				<view class="r">
-					<u-input type="number" placeholder="输入数量" @input="handler()" v-model="form.num">
+					<u-input type="number" placeholder="输入件数" @input="handler()" v-model="form.num">
 					</u-input>
 				</view>
 			</view>
@@ -64,7 +59,7 @@
 				</view>
 			</view>
 			<view class="item">
-				<view class="l">储存条件：</view>
+				<view class="l">储藏条件：</view>
 				<view class="r">
 					<u-input placeholder="储存条件" @input="handler()" v-model="form.storageMode" />
 				</view>
@@ -88,9 +83,9 @@
 				</view>
 			</view>
 			<view class="item">
-				<view class="l">注册商号：</view>
+				<view class="l">生产商出注册号：</view>
 				<view class="r">
-					<u-input placeholder="注册商号" @input="handler()" v-model="form.producerCode" />
+					<u-input placeholder="生产商出注册号" @input="handler()" v-model="form.producerCode" />
 				</view>
 			</view>
 			<view class="item">
@@ -106,6 +101,13 @@
 				</view>
 			</view>
 			<view class="item">
+				<view class="l" style="flex: 7;">运输车辆：</view>
+				<view class="r">
+					<u--textarea @input="handler()" v-model="form.chinaCarNo" placeholder="运输车车牌,多个请用逗号隔开">
+					</u--textarea>
+				</view>
+			</view>
+			<view class="item">
 				<view class="l">司机姓名：</view>
 				<view class="r">
 					<u--textarea @input="handler()" v-model="form.driverName" placeholder="司机姓名,多个请用逗号隔开"></u--textarea>
@@ -118,12 +120,7 @@
 					</u--textarea>
 				</view>
 			</view>
-			<view class="item">
-				<view class="l">代理商：</view>
-				<view class="r">
-					<u-input placeholder="代理商" @input="handler()" v-model="form.agent" />
-				</view>
-			</view>
+
 			<view class="item">
 				<view class="l" style="flex: 7;">代理商电话：</view>
 				<view class="r">
@@ -131,23 +128,12 @@
 				</view>
 			</view>
 			<view class="item">
-				<view class="l" style="flex: 7;">运输车车牌：</view>
-				<view class="r">
-					<u-input placeholder="运输车车牌" @input="handler()" v-model="form.chinaCarNo" />
-				</view>
-			</view>
-			<view class="item">
-				<view class="l">越南车牌：</view>
-				<view class="r">
-					<u-input placeholder="越南车牌" @input="handler()" v-model="form.carNo" />
-				</view>
-			</view>
-			<view class="item">
 				<view class="l" style="flex: 7;">海关报关单据：</view>
 				<view class="r">
 					<u-input placeholder="海关报关单据" @input="handler()" v-model="form.customProof" />
 				</view>
 			</view>
+
 			<view class="item">
 				<view class="l" style="flex: 7;">检验检疫证：</view>
 				<view class="r">
@@ -160,13 +146,25 @@
 					<u-input placeholder="商铺" @input="handler()" v-model="form.shop" />
 				</view>
 			</view>
-
+			<view class="item">
+				<view class="l"><text style="color: red;">*</text>生产批号：</view>
+				<view class="r">
+					<u-input placeholder="生产批号" @input="handler()" v-model="form.productionCode" />
+				</view>
+			</view>
 			<view class="item">
 				<view class="l">柜号：</view>
 				<view class="r">
 					<u-input placeholder="柜号" @input="handler()" v-model="form.containerCode" />
 				</view>
 			</view>
+			<view class="item">
+				<view class="l">越南车牌：</view>
+				<view class="r">
+					<u-input placeholder="越南车牌" @input="handler()" v-model="form.carNo" />
+				</view>
+			</view>
+
 		</view>
 		<u-button type="primary" text="确定" @click="saveFn"></u-button>
 		<u-button type="info" text="重置" @click="cleanFn" style="margin-top: 20rpx;"></u-button>

sp-admin/sa-view/tb-disinfect/print.html

@@ -143,7 +143,10 @@ $(function(){
 			$("#applyTime").html(data.data.applyTime);
 			$("#acceptPeople").html(data.data.acceptPeople);
 			$("#acceptTime").html(data.data.acceptTime);
-			$("#money").html(data.data.money + "分");
+			if(data.data.money>0){
+				$("#money").html( data.data.money+ "分");
+			}
+		
 			$("#myPrintArea").printArea();
 		}
 	});

sp-server/src/main/java/com/pj/api/service/ApiService.java

@@ -115,12 +115,22 @@ public class ApiService {
     }
 
     public void addDeclare(TbDeclare tbDeclare) {
+        String chinaCarNo = tbDeclare.getChinaCarNo();
+        if (StrUtil.isNotEmpty(chinaCarNo)) {
+            chinaCarNo = chinaCarNo.toUpperCase();
+            tbDeclare.setChinaCarNo(chinaCarNo);
+        }
+        String carNo = tbDeclare.getCarNo();
+        if (StrUtil.isNotEmpty(carNo)) {
+            carNo = carNo.toUpperCase();
+            tbDeclare.setCarNo(carNo);
+        }
         String productionCode = tbDeclare.getProductionCode();
-        Date now=new Date();
+        Date now = new Date();
         if (StrUtil.isNotEmpty(productionCode)) {
             TbDeclare db = tbDeclareService.findByProductionCode(productionCode);
-            if (db!=null){
-                BeanUtil.copyProperties(tbDeclare,db,"id");
+            if (db != null) {
+                BeanUtil.copyProperties(tbDeclare, db, "id");
                 db.setCreateTime(now);
                 tbDeclareService.updateById(db);
                 return;
@@ -133,7 +143,7 @@ public class ApiService {
 
     public void addDisinfect(TbDisinfect tbDisinfect) {
         String nowStr = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMddHHmmss"));
-        tbDisinfect.setCode(nowStr+RandomUtil.randomNumbers(6)).setApplyTime(DateUtil.today());
+        tbDisinfect.setCode(nowStr + RandomUtil.randomNumbers(6)).setApplyTime(DateUtil.today());
         tbDisinfectService.save(tbDisinfect);
     }
 }