1

unimall-app-api/src/main/java/com/iotechn/unimall/app/api/task/TaskAppService.java

@@ -207,6 +207,7 @@ public interface TaskAppService {
             @HttpParam(name = "outMode", type = HttpParamType.COMMON, description = "出库方式") String outMode,
             @NotNull @HttpParam(name = "waterContent", type = HttpParamType.COMMON, description = "水分") Float waterContent,
             @HttpParam(name = "memo", type = HttpParamType.COMMON, description = "件数") String memo,
+            @HttpParam(name = "titleNo", type = HttpParamType.COMMON, description = "封号") String titleNo,
             @NotNull @HttpParam(name = "userId", type = HttpParamType.USER_ID, description = "用户ID") Long userId,
             @NotNull @HttpParam(name = "nextUserId", type = HttpParamType.COMMON, description = "下一个外勤id") Long nextUserId
     ) throws ServiceException;
@@ -223,7 +224,8 @@ public interface TaskAppService {
             @HttpParam(name = "protein", type = HttpParamType.COMMON, description = "蛋白") Float protein,
             @HttpParam(name = "outMode", type = HttpParamType.COMMON, description = "出库方式") String outMode,
             @HttpParam(name = "waterContent", type = HttpParamType.COMMON, description = "水分") Float waterContent,
-            @HttpParam(name = "memo", type = HttpParamType.COMMON, description = "件数") String memo
+            @HttpParam(name = "memo", type = HttpParamType.COMMON, description = "件数") String memo,
+            @HttpParam(name = "titleNo", type = HttpParamType.COMMON, description = "封号") String titleNo
     ) throws ServiceException;
     @HttpMethod(description = "保存收货跟踪任务信息")
     TaskDO saveTaskInfoSH(

unimall-app-api/src/main/java/com/iotechn/unimall/app/api/task/TaskAppServiceImpl.java

@@ -1798,7 +1798,7 @@ public class TaskAppServiceImpl implements TaskAppService{
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public TaskDO finishTaskInfoCK(Long taskId, String carNo, Float grossWeight, Float skinWeight, Float netWeight, String poundImg,String warehouse,Float price,Float protein,String outMode, Float waterContent,String memo, Long userId,Long nextUserId) throws ServiceException {
+    public TaskDO finishTaskInfoCK(Long taskId, String carNo, Float grossWeight, Float skinWeight, Float netWeight, String poundImg,String warehouse,Float price,Float protein,String outMode, Float waterContent,String memo, String titleNo,Long userId,Long nextUserId) throws ServiceException {
         TaskDO taskDO = taskMapper.selectById(taskId);
         // 查询公司负责人姓名
         CompanyDO companyDO = companyMapper.selectById(taskDO.getCompanyId());
@@ -1816,6 +1816,7 @@ public class TaskAppServiceImpl implements TaskAppService{
         taskDO.setTaskStatus(TaskStatusType.STATUS2.getCode());
         taskDO.setGmtUpdate(now);
         taskDO.setMemo(memo);
+        taskDO.setTitleNo(titleNo);
         if(taskMapper.updateById(taskDO) > 0){
             // 更新库点货量
             List<TradeDO> tradeDOList = tradeMapper.selectList(new EntityWrapper<TradeDO>().eq("order_no", taskDO.getOrderNo()));
@@ -1874,7 +1875,7 @@ public class TaskAppServiceImpl implements TaskAppService{
     }
 
     @Override
-    public TaskDO saveTaskInfoCK(Long taskId, String carNo, Float grossWeight, Float skinWeight, Float netWeight, String poundImg, String warehouse, Float price, Float protein,String outMode, Float waterContent,String memo) throws ServiceException {
+    public TaskDO saveTaskInfoCK(Long taskId, String carNo, Float grossWeight, Float skinWeight, Float netWeight, String poundImg, String warehouse, Float price, Float protein,String outMode, Float waterContent,String memo,String titleNo) throws ServiceException {
         TaskDO taskDO = taskMapper.selectById(taskId);
         Date now = new Date();
         taskDO.setGrossWeight(grossWeight);
@@ -1889,6 +1890,7 @@ public class TaskAppServiceImpl implements TaskAppService{
         taskDO.setWaterContent(waterContent);
         taskDO.setGmtUpdate(now);
         taskDO.setMemo(memo);
+        taskDO.setTitleNo(titleNo);
         if(taskMapper.updateById(taskDO) > 0){
             return taskDO;
         }

unimall-app/pageA/pages/account.vue

@@ -115,6 +115,9 @@
 		},
 		methods: {
 			numFilter (value) {
+				if(!value){
+					return 0
+				}
 				// 截取当前数据到小数点后两位
 				let realVal = parseFloat(value).toFixed(2)
 				return realVal
@@ -326,11 +329,6 @@
 			boxNoInput(e){
 				this.boxNo = e.detail.value
 			},
-			numFilter (value) {
-				// 截取当前数据到小数点后两位
-				let realVal = parseFloat(value).toFixed(2)
-				return realVal
-			},
 			carInput(item,e){
 				if(item.count>item.tranCount){
 					uni.showToast({

unimall-app/pageA/pages/task.vue

@@ -475,6 +475,9 @@
 				this.boxNo = e.detail.value
 			},
 			numFilter (value) {
+				if(!value){
+					return 0
+				}
 				// 截取当前数据到小数点后两位
 				let realVal = parseFloat(value).toFixed(2)
 				return realVal

unimall-app/pageA/pages/task_detail.vue

@@ -371,6 +371,9 @@
 		},
 		methods: {
 			numFilter (value) {
+				if(!value){
+					return 0
+				}
 				// 截取当前数据到小数点后两位
 				let realVal = parseFloat(value).toFixed(2)
 				return realVal

unimall-app/pageA/pages/task_detail_ck.vue

@@ -13,6 +13,18 @@
 						{{userName}}
 					</view>
 				</view>
+				<view class="c-row b-b">
+					<text class="tit">车牌号</text>
+					<view class="con-list">
+						<text>{{carNo}}</text>
+					</view>
+				</view>
+				<view class="c-row b-b">
+					<text class="tit">箱号</text>
+					<view class="con-list">
+						<text>{{boxNo}}</text>
+					</view>
+				</view>
 		<!-- 		<view class="c-row b-b">
 					<text class="tit">目的地</text>
 					<view class="con-list">
@@ -83,9 +95,9 @@
 					</view>
 				</view>
 				<view class="c-row b-b">
-					<text class="tit">车牌号</text>
+					<text class="tit">封号</text>
 					<view class="con-list">
-						<input placeholder="请填写车牌号" name="input" v-model="carNo" ></input>
+						<input placeholder="请填写封号" name="input" v-model="titleNo" ></input>
 					</view>
 				</view>
 				<view class="cu-form-group margin-top">
@@ -215,7 +227,9 @@
 				price:'',
 				address:'',
 				memo:'',
-				showPopup:false
+				showPopup:false,
+				boxNo:'',
+				titleNo:''
 			};
 		},
 		computed: {
@@ -248,11 +262,12 @@
 					that.warehouses=that.carInfo.warehouse.split(',')
 				}
 				that.waterContent=that.carInfo.waterContent
-				
+				that.titleNo = that.carInfo.titleNo
 				that.companyName=that.carInfo.companyName
 				that.companyPhone=that.carInfo.companyPhone
 				that.userName=that.carInfo.userName
 				that.carNo=that.carInfo.carNo
+				that.boxNo = that.carInfo.boxNo
 				that.count=that.carInfo.count
 				that.alreadyCount=that.carInfo.alreadyCount
 				that.notCount=that.carInfo.notCount
@@ -266,6 +281,9 @@
 		},
 		methods: {
 			numFilter (value) {
+				if(!value){
+					return 0
+				}
 				// 截取当前数据到小数点后两位
 				let realVal = parseFloat(value).toFixed(2)
 				return realVal
@@ -427,6 +445,7 @@
 					address:!that.address?'':that.address,
 					outMode:!that.outMode1?'':that.outMode1,
 					memo:!that.memo?'':that.memo,
+					titleNo:!that.titleNo?'':that.titleNo,
 				}, failres => {
 					that.$api.msg(failres.errmsg)
 					uni.hideLoading()
@@ -493,6 +512,7 @@
 					address:!that.address?'':that.address,
 					outMode:!that.outMode1?'':that.outMode1,
 					memo:!that.memo?'':that.memo,
+					titleNo:!that.titleNo?'':that.titleNo,
 					nextUserId:item.id
 				}, failres => {
 					that.$api.msg(failres.errmsg)
@@ -562,6 +582,7 @@
 					address:!that.address?'':that.address,
 					outMode:!that.outMode1?'':that.outMode1,
 					memo:!that.memo?'':that.memo,
+					titleNo:!that.titleNo?'':that.titleNo,
 					nextUserId:-1
 				}, failres => {
 					that.$api.msg(failres.errmsg)

unimall-app/pageA/pages/task_detail_jy.vue

@@ -199,6 +199,9 @@
 				this.boxNo = e.detail.value
 			},
 			numFilter (value) {
+				if(!value){
+					return 0
+				}
 				// 截取当前数据到小数点后两位
 				let realVal = parseFloat(value).toFixed(2)
 				return realVal

unimall-app/pageA/pages/task_detail_ys.vue

@@ -159,6 +159,9 @@
 		},
 		methods: {
 			numFilter (value) {
+				if(!value){
+					return 0
+				}
 				// 截取当前数据到小数点后两位
 				let realVal = parseFloat(value).toFixed(2)
 				return realVal

unimall-app/pageA/product/detail.vue

@@ -186,7 +186,7 @@
 			<view class="action-btn-group">
 				<button type="primary" class=" action-btn no-border buy-now-btn" @click="contactUs">联系我们</button>
 				<button v-if="goods.status == 1" type="primary" class=" action-btn no-border add-cart-btn" >交易结束</button>
-				<button v-else type="primary" class=" action-btn no-border add-cart-btn" @click="tradeNow">立即交易</button>
+				<button v-else type="primary" class=" action-btn no-border add-cart-btn" @click="tradeNow">我要买粮</button>
 			</view>
 		</view>
 	</view>
@@ -267,6 +267,9 @@
 		},
 		methods: {
 			numFilter (value) {
+				if(!value){
+					return 0
+				}
 				// 截取当前数据到小数点后两位
 				let realVal = parseFloat(value).toFixed(2)
 				return realVal

unimall-app/pageA/product/detail_buy.vue

@@ -152,7 +152,7 @@
 		<view class="page-bottom">
 			<view class="action-btn-group">
 				<button type="primary" class=" action-btn no-border buy-now-btn" @click="contactUs">联系我们</button>
-				<button v-if="goods.status == 20" type="primary" class=" action-btn no-border add-cart-btn" @click="tradeNow">立即交易</button>
+				<button v-if="goods.status == 20" type="primary" class=" action-btn no-border add-cart-btn" @click="tradeNow">我要卖粮</button>
 				<button v-else type="primary" class=" action-btn no-border add-cart-btn" >交易结束</button>
 			</view>
 		</view>

unimall-app/pageA/product/list.vue

@@ -290,6 +290,9 @@
 		},
 		methods: {
 			numFilter (value) {
+				if(!value){
+					return 0
+				}
 				// 截取当前数据到小数点后两位
 				let realVal = parseFloat(value).toFixed(2)
 				return realVal

unimall-app/pageA/product/trade.vue

@@ -128,11 +128,12 @@
 			<view class="title">{{unitPrice*count}}元</view>
 		</view>
 		<view v-if="companyId==2" class="cu-form-group align-start">
-			<view class="title">结算价格=点价+基差+发票+包装费</view>
+			<!-- <view class="title">结算价格=点价+基差+发票+包装费</view> -->
+			<view class="title">最终以纸质合同为准</view>
 		</view>
-		<view v-else class="cu-form-group align-start">
+		<view class="cu-form-group align-start">
 			<view class="title">备注</view>
-			<textarea maxlength="-1" :disabled="modalName!=null" @input="textareaInput" placeholder="备注"></textarea>
+			<textarea maxlength="-1" :disabled="modalName!=null" @input="textareaInput" placeholder="请填写包装规格、质量、包装物要求。例:50kg袋装、大粒、彩包"></textarea>
 		</view>
 		<view class="padding flex flex-direction">
 			<button class="cu-btn bg-red margin-tb-sm lg" @click="commit">提交</button>
@@ -169,7 +170,7 @@
 					priceTypeIndex:0,
 					bankNameIndex:0,
 					packingIndex:0,
-					packingType: ['散装', '大袋(50kg)', '小袋(25kg)'],
+					packingType: ['散装', '袋装'],
 					invoiceType: ['不开发票', '普通发票', '增值税发票'],
 					invoiceType1: ['不开发票','增值税发票'],
 					acceptType: ['第三方检验（国家检验资质）', '交收地库或港出具的检验', '现场看货','其他'],

unimall-app/pageA/product/trade_buy.vue

@@ -116,9 +116,10 @@
 			<view class="title">{{unitPrice*count}}元</view>
 		</view>
 		<view v-if="companyId==2" class="cu-form-group align-start">
-			<view class="title">结算价格=点价+基差+发票+卸车费</view>
+			<!-- <view class="title">结算价格=点价+基差+发票+卸车费</view> -->
+			<view class="title">最终以纸质合同为准</view>
 		</view>
-		<view v-else class="cu-form-group align-start">
+		<view  class="cu-form-group align-start">
 			<view class="title">备注</view>
 			<textarea maxlength="-1" :disabled="modalName!=null" @input="textareaInput" placeholder="备注"></textarea>
 		</view>

unimall-app/pageB/contract/look.vue

@@ -132,6 +132,9 @@
 			
 			methods: {
 				numFilter (value) {
+					if(!value){
+						return 0
+					}
 					// 截取当前数据到小数点后两位
 					let realVal = parseFloat(value).toFixed(2)
 					return realVal

unimall-app/pages/tran/my_car_detail.vue

@@ -447,6 +447,9 @@
 		},
 		methods: {
 			numFilter (value) {
+				if(!value){
+					return 0
+				}
 				// 截取当前数据到小数点后两位
 				let realVal = parseFloat(value).toFixed(2)
 				return realVal

unimall-app/pages/tran/tran.vue

@@ -147,6 +147,9 @@
 			},
 			methods: {
 				numFilter (value) {
+					if(!value){
+						return 0
+					}
 					// 截取当前数据到小数点后两位
 					let realVal = parseFloat(value).toFixed(2)
 					return realVal

unimall-app/pages/tran/tran_detail.vue

@@ -317,6 +317,9 @@
 		},
 		methods: {
 			numFilter (value) {
+				if(!value){
+					return 0
+				}
 				// 截取当前数据到小数点后两位
 				let realVal = parseFloat(value).toFixed(2)
 				return realVal

unimall-app/pages/user/task_arrive.vue

@@ -257,6 +257,9 @@
 				this.boxNo = e.detail.value
 			},
 			numFilter (value) {
+				if(!value){
+					return 0
+				}
 				// 截取当前数据到小数点后两位
 				let realVal = parseFloat(value).toFixed(2)
 				return realVal

unimall-app/pages/user/task_detail_buy.vue

@@ -484,6 +484,9 @@
 				}
 			},
 			numFilter (value) {
+				if(!value){
+					return 0
+				}
 				// 截取当前数据到小数点后两位
 				let realVal = parseFloat(value).toFixed(2)
 				return realVal

unimall-app/pages/user/task_detail_hy.vue

@@ -318,6 +318,9 @@
 				this.boxNo = e.detail.value
 			},
 			numFilter (value) {
+				if(!value){
+					return 0
+				}
 				// 截取当前数据到小数点后两位
 				let realVal = parseFloat(value).toFixed(2)
 				return realVal

unimall-app/pages/user/task_detail_hyrk.vue

@@ -190,6 +190,9 @@
 				this.inOtherFee = e.detail.value
 			},
 			numFilter (value) {
+				if(!value){
+					return 0
+				}
 				// 截取当前数据到小数点后两位
 				let realVal = parseFloat(value).toFixed(2)
 				return realVal

unimall-app/pages/user/task_detail_kn.vue

@@ -162,7 +162,14 @@
 		},
 		
 		methods: {
-			
+			numFilter (value) {
+				if(!value){
+					return 0
+				}
+				// 截取当前数据到小数点后两位
+				let realVal = parseFloat(value).toFixed(2)
+				return realVal
+			},
 			hideModal(e) {
 				this.modalName = null
 			},

unimall-app/pages/user/task_detail_wai.vue

@@ -239,6 +239,9 @@
 		},
 		methods: {
 			numFilter (value) {
+				if(!value){
+					return 0
+				}
 				// 截取当前数据到小数点后两位
 				let realVal = parseFloat(value).toFixed(2)
 				return realVal

unimall-app/pages/user/task_detail_zx.vue

@@ -222,6 +222,14 @@
 		},
 		
 		methods: {
+			numFilter (value) {
+				if(!value){
+					return 0
+				}
+				// 截取当前数据到小数点后两位
+				let realVal = parseFloat(value).toFixed(2)
+				return realVal
+			},
 			ChooseImageBox() {
 				var that = this
 				uni.chooseImage({

unimall-app/websocket_sdk.js

@@ -275,6 +275,12 @@ export default class Websocket {
 					if (res.statusCode === 200) {
 						let name = 'myTip';
 						let value = res.data.data.myTips;
+						if(value > 0){
+							uni.setTabBarBadge({
+							  index: 4,
+							  text: value+""
+							})
+						}
 						store.commit('$uStore', {
 							name,
 							value
@@ -291,6 +297,7 @@ export default class Websocket {
 							name,
 							value
 						});
+					
 					}
 				}
 			})

unimall-launcher/src/main/resources/application.properties

@@ -19,6 +19,7 @@ spring.druid.url=jdbc:mysql://47.100.3.209:3306/unimall?createDatabaseIfNotExist
 #spring.druid.url=jdbc:mysql://localhost:3306/unimall?createDatabaseIfNotExist=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowMultiQueries=true
 spring.druid.username=root
 spring.druid.password=Ccj841968545
+
 #spring.druid.password=
 spring.druid.maxActive=30
 spring.druid.minIdle=5