erp对接销售订单

snowy-admin-web/src/api/biz/bizSaleOrderApi.js

@@ -29,6 +29,10 @@ export default {
 	queryByCustomerId(data){
 		return request('queryByCustomerId',data,'get')
 	},
+	//根据客户id查询erp订单信息
+	queryByErp(data){
+		return request('queryByErp',data,'get')
+	},
 	//详情
 	detailById(data){
 		return request('detailById',data,'get')

snowy-admin-web/src/views/biz/bizappointmentrecord/form.vue

@@ -74,7 +74,7 @@
 			orderIdList.value = res.map((item)=>{
 				return{
 					value:item.id,
-					label:item.orderName + '-' + item.orderNumber
+					label:item.orderNumber
 				}
 			})
 		})

snowy-admin-web/src/views/biz/bizorder/form.vue

@@ -103,11 +103,11 @@
 			})
 		}*/
 		if(formData.value.customerId){
-			bizSaleOrderApi.queryByCustomerId({id:formData.value.customerId,flag:formData.value.id?"edit":"add"}).then((res)=>{
+			bizSaleOrderApi.queryByErp({id:formData.value.customerId,flag:formData.value.id?"edit":"add"}).then((res)=>{
 				saleOrderInfoList.value = res.map((item)=>{
 					return{
 						value:item.id,
-						label:item.saleOrderName
+						label:item.saleOrderNumber
 					}
 				})
 			})
@@ -116,7 +116,7 @@
 		if(formData.value.saleOrderInfo){
 			bizSaleOrderApi.detailById({id:formData.value.saleOrderInfo}).then((res)=>{
 				//根据货品名称和重量查询提货时间段
-				goodsConfApi.getList({goodsName:res.saleGoodsName,needWeight:res.saleOrderWeight}).then((res)=>{
+				goodsConfApi.getList({goodsName:res.saleGoodsName,goodsCode:res.goodsCode,needWeight:res.saleOrderWeight}).then((res)=>{
 					deliveryTimeIdList.value = res.map((item)=>{
 						return{
 							value:item.id,
@@ -132,11 +132,11 @@
 	const onChangeCustomer =(value)=>{
 		formData.value.saleOrderInfo = ''
 		formData.value.deliveryTimeId = ''
-		bizSaleOrderApi.queryByCustomerId({id:formData.value.customerId,flag:formData.value.id?"edit":"add"}).then((res)=>{
+		bizSaleOrderApi.queryByErp({id:formData.value.customerId,flag:formData.value.id?"edit":"add"}).then((res)=>{
 			saleOrderInfoList.value = res.map((item)=>{
 				return{
 					value:item.id,
-					label:item.saleOrderName
+					label:item.saleOrderNumber
 				}
 			})
 		})
@@ -148,13 +148,14 @@
 			formData.value.orderName = res.saleOrderName
 			formData.value.orderNumber= res.saleOrderNumber
 			formData.value.goodsName = res.saleGoodsName
+			formData.value.goodsCode = res.saleGoodsCode
 			formData.value.orderWeight = res.saleOrderWeight
 			formData.value.orderType = res.saleOrderType
 			formData.value.deliveryTimeId = ''
 			//根据货品名称和重量查询提货时间段
 			console.log("goodsName:"+formData.value.goodsName)
 			console.log("needWeight:"+formData.value.orderWeight)
-			goodsConfApi.getList({goodsName:formData.value.goodsName,needWeight:formData.value.orderWeight}).then((res)=>{
+			goodsConfApi.getList({goodsName:formData.value.goodsName,goodsCode:formData.value.goodsCode,needWeight:formData.value.orderWeight}).then((res)=>{
 				deliveryTimeIdList.value = res.map((item)=>{
 					return{
 						value:item.id,

snowy-admin-web/src/views/biz/bizorder/index.vue

@@ -127,6 +127,9 @@
 				<template v-if="column.dataIndex === 'netWeight'">
 					{{record.netWeight + '吨'}}
 				</template>
+				<template v-if="column.dataIndex === 'shippingWeight'">
+					{{record.shippingWeight + '吨'}}
+				</template>
 				<template v-if="column.dataIndex === 'action'">
 
 					<a @click="showModal(record)" v-if="record.orderStatus == '3' || record.orderStatus == '4'">二维码</a>
@@ -351,12 +354,12 @@
 			align:'center',
 			width: 130
 		},
-		{
+		/*{
 			title: '订单名称',
 			dataIndex: 'orderName',
 			align:'center',
 			width: 130
-		},
+		},*/
 		{
 			title: '客户名称',
 			dataIndex: 'customerName',
@@ -410,6 +413,12 @@
 			align:'center',
 			width: 100
 		},
+		{
+			title: '卸货重量',
+			dataIndex: 'shippingWeight',
+			align:'center',
+			width: 100
+		},
 	]
 	// 操作栏通过权限判断是否显示
 	columns.push({

snowy-admin-web/src/views/biz/bizsaleorder/index.vue

@@ -124,11 +124,6 @@
 			dataIndex: 'saleOrderNumber',
 			align:'center'
 		},
-		{
-			title: '订单名称',
-			dataIndex: 'saleOrderName',
-			align:'center'
-		},
 		{
 			title: '订单类型',
 			dataIndex: 'saleOrderType',
@@ -144,11 +139,26 @@
 			dataIndex: 'saleGoodsName',
 			align:'center'
 		},
+		{
+			title: '货品编码',
+			dataIndex: 'saleGoodsCode',
+			align:'center'
+		},
 		{
 			title: '订单重量(吨)',
 			dataIndex: 'saleOrderWeight',
 			align:'center'
 		},
+		{
+			title: '单价(元)',
+			dataIndex: 'salePrice',
+			align:'center'
+		},
+		{
+			title: '业务员',
+			dataIndex: 'businessName',
+			align:'center'
+		},
 		{
 			title: '状态',
 			dataIndex: 'saleStatus',

snowy-admin-web/src/views/biz/count/orderplan.vue

@@ -115,6 +115,11 @@
 			dataIndex: 'netWeight',
 			align:'center'
 		},
+		{
+			title: '卸货重量(吨)',
+			dataIndex: 'shippingWeight',
+			align:'center'
+		},
 		{
 			title: '实际拖运重量(吨)',
 			dataIndex: 'actualWeight',

snowy-admin-web/src/views/biz/goodsConf/addForm.vue

@@ -95,7 +95,7 @@
 			(current && current < dayjs(nowTime.value).startOf('time'))
 		)
 	}
-	
+
 	// 打开抽屉
 	const onOpen = (record) => {
 		open.value = true
@@ -113,7 +113,7 @@
 			goodsList.value = data.map((item) => {
 				return {
 					value: item['id'],
-					label: item['goodsName']+" - "+item['goodsModel']
+					label: item['goodsName']+" - "+item['goodsCode']
 				}
 			})
 		}).finally(() => {
@@ -173,7 +173,7 @@
 				}else{
 					goodsFlag = false
 				}
-				
+
 				if(goodsFlag){
 					formDatas.goodsJson = JSON.stringify(formDatas.goodsJson)
 					const formDataParam = cloneDeep(formData.value)
@@ -193,7 +193,7 @@
 					message.error('货品信息存在重复情况，请处理！')
 					return
 				}
-				
+
 			})
 			.catch(() => {})
 	}

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizorder/entity/BizOrder.java

@@ -135,4 +135,7 @@ public class BizOrder extends CommonEntity{
     @TableField(exist = false)
     private BigDecimal actualWeight;
 
+    /**卸货重量*/
+    private BigDecimal shippingWeight;
+
 }

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizorder/mapper/mapping/BizOrderMapper.xml

@@ -20,6 +20,7 @@
             bo.order_status,
             bo.order_weight/1000 order_weight,
             bo.net_weight/1000 net_weight,
+            ifnull(bo.shipping_weight/1000,0) shipping_weight,
             bgc.CONF_START_TIME,
             bgc.CONF_END_TIME,
             bo.sale_order_info,
@@ -45,6 +46,8 @@
                 bc.name customerName,
                 bo.order_weight/1000 order_weight,
                 bo.net_weight/1000 net_weight,
+                ifnull(bo.shipping_weight/1000,0) shipping_weight,
+                bo.create_time,
                 IFNULL(br.actualWeight/1000,0) actualWeight,
                 case
                     when IFNULL(br.actualWeight,0)>bo.net_weight then '1'
@@ -56,6 +59,6 @@
             on br.order_id = bo.id
             ${ew.customSqlSegment}
         ) a
-        order by a.orderFlag desc
+        order by a.create_time desc
     </select>
 </mapper>

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizorder/param/BizOrderAddParam.java

@@ -37,7 +37,6 @@ public class BizOrderAddParam {
 
     /** 订单名称 */
     @Schema(description = "订单名称", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotBlank(message = "orderName不能为空")
     private String orderName;
 
     /** 客户id */

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizorder/param/BizOrderExportTotal.java

@@ -35,6 +35,11 @@ public class BizOrderExportTotal {
     @ExcelProperty({"订单计划统计", "过磅重量(吨)"})
     private BigDecimal netWeight;
 
+    /** 卸货重量 */
+    @HeadStyle(fillPatternType = FillPatternTypeEnum.SOLID_FOREGROUND, fillForegroundColor = 120)
+    @ExcelProperty({"订单计划统计", "卸货重量(吨)"})
+    private BigDecimal shippingWeight;
+
     /** 过磅重量 */
     @HeadStyle(fillPatternType = FillPatternTypeEnum.SOLID_FOREGROUND, fillForegroundColor = 120)
     @ExcelProperty({"订单计划统计", "实际托运重量(吨)"})

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizorder/service/impl/BizOrderServiceImpl.java

@@ -446,6 +446,7 @@ public class BizOrderServiceImpl extends ServiceImpl<BizOrderMapper, BizOrder> i
             queryWrapper.like("bc.name",bizOrderPageParam.getCustomerName());
         }
         queryWrapper.eq("bo.delete_flag","NOT_DELETE");
+        //queryWrapper.orderByDesc("bo.create_time");
         return queryWrapper;
     }
 

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizsaleorder/controller/BizSaleOrderController.java

@@ -130,6 +130,18 @@ public class BizSaleOrderController {
         return CommonResult.data(bizSaleOrderService.queryByCustomerId(bizSaleOrderIdParam));
     }
 
+    /**
+     * 根据客户id查询erp销售订单信息
+     *
+     * @author fanzherong
+     * @date  2025/04/10 09:31
+     */
+    @Operation(summary = "根据客户id查询erp销售订单信息")
+    @GetMapping("/biz/bizsaleorder/queryByErp")
+    public CommonResult<List<BizSaleOrder>> queryByErp(@Valid BizSaleOrderIdParam bizSaleOrderIdParam) {
+        return CommonResult.data(bizSaleOrderService.queryByErp(bizSaleOrderIdParam));
+    }
+
     /**
      * 详情（重量转换）
      *

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizsaleorder/entity/BizSaleOrder.java

@@ -70,4 +70,13 @@ public class BizSaleOrder extends CommonEntity {
     /**货品编码*/
     private String saleGoodsCode;
 
+    /**关联id*/
+    private String relationId;
+
+    /**单价*/
+    private BigDecimal salePrice;
+
+    /***业务员*/
+    private String businessName;
+
 }

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizsaleorder/mapper/mapping/BizSaleOrderMapper.xml

@@ -13,7 +13,9 @@
             bso.sale_status,
             bso.customer_id,
             bc.name customerName,
-            bso.sale_goods_code
+            bso.sale_goods_code,
+            bso.sale_price,
+            bso.business_name
         from biz_sale_order bso
         left join biz_customer bc on bc.id = bso.customer_id
         ${ew.customSqlSegment}

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizsaleorder/service/BizSaleOrderService.java

@@ -82,4 +82,7 @@ public interface BizSaleOrderService extends IService<BizSaleOrder> {
     List<BizSaleOrder> queryByCustomerId(BizSaleOrderIdParam bizSaleOrderIdParam);
 
     BizSaleOrder detailById(BizSaleOrderIdParam bizSaleOrderIdParam);
+
+
+    List<BizSaleOrder> queryByErp(BizSaleOrderIdParam bizSaleOrderIdParam);
 }

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizsaleorder/service/impl/BizSaleOrderServiceImpl.java

@@ -16,13 +16,21 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollStreamUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
+import cn.hutool.http.HttpUtil;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.google.common.collect.Maps;
 import jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import vip.xiaonuo.biz.core.sign.utils.MD5;
+import vip.xiaonuo.biz.modular.customer.entity.BizCustomer;
+import vip.xiaonuo.biz.modular.customer.service.BizCustomerService;
 import vip.xiaonuo.biz.modular.goods.entity.BizGoods;
 import vip.xiaonuo.biz.modular.goods.service.BizGoodsService;
 import vip.xiaonuo.common.enums.CommonSortOrderEnum;
@@ -38,7 +46,9 @@ import vip.xiaonuo.biz.modular.bizsaleorder.service.BizSaleOrderService;
 
 import javax.annotation.RegEx;
 import java.math.BigDecimal;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 销售订单Service接口实现类
@@ -52,6 +62,12 @@ public class BizSaleOrderServiceImpl extends ServiceImpl<BizSaleOrderMapper, Biz
     @Resource
     private BizGoodsService goodsService;
 
+    @Resource
+    private BizCustomerService bizCustomerService;
+
+    @Resource
+    private BizGoodsService bizGoodsService;
+
     @Override
     public Page<BizSaleOrder> page(BizSaleOrderPageParam bizSaleOrderPageParam) {
         QueryWrapper<BizSaleOrder> queryWrapper = new QueryWrapper<BizSaleOrder>().checkSqlInjection();
@@ -161,4 +177,105 @@ public class BizSaleOrderServiceImpl extends ServiceImpl<BizSaleOrderMapper, Biz
         bizSaleOrder.setSaleOrderWeight(bizSaleOrder.getSaleOrderWeight().divide(new BigDecimal(1000)));
         return bizSaleOrder;
     }
+
+    @Override
+    public List<BizSaleOrder> queryByErp(BizSaleOrderIdParam bizSaleOrderIdParam) {
+        BizCustomer bizCustomer = bizCustomerService.getById(bizSaleOrderIdParam.getId());
+        if(ObjectUtil.isNull(bizCustomer)){
+            throw new CommonException("未查询到客户信息！");
+        }
+        String appId = "0ol2749zps9xhid1";
+        String appSecret = "e4w9ylwk7grdsdzpbcq8kcedg7ailh1c";
+        String nonce = "21459479202627653";
+        long timestamp = System.currentTimeMillis() / 1000;
+        String sign = getSign(appId, appSecret, nonce, timestamp + "");
+        Map<String,String> map = new HashMap<>();
+        map.put("appId",appId);
+        map.put("appSecret",appSecret);
+        map.put("nonce",nonce);
+        map.put("timestamp",timestamp+"");
+        map.put("signature",sign);
+
+        Map<String,Object> paramMap = Maps.newHashMap();
+        paramMap.put("keywords",bizCustomer.getYongId());
+        paramMap.put("pageNum","1");
+        paramMap.put("pageSize","10");
+        //根据用户中的用友id字段查询erp那边销售订单
+        String result = HttpUtil.createPost("https://1072el542wi61.vicp.fun/api/erp/u8data/getsalelist")
+                .addHeaders(map).body(JSONObject.toJSONString(paramMap)).execute().body();
+        JSONObject jsonObject = JSONObject.parseObject(result);
+        String resData = jsonObject.getString("resData");
+        JSONArray jsonArray = JSONObject.parseArray(resData);
+        System.out.println("size:"+jsonArray.size());
+        if(jsonArray.size()>0){
+            for(int i=0; i<jsonArray.size(); i++){
+                JSONObject object = jsonArray.getJSONObject(i);
+                String relationId = object.getString("id");
+                //订单编号
+                String orderCode = object.getString("cSOCode");
+                //货品编码
+                String goodsCode = object.getString("cInvCode");
+                //货品名称
+                String goodsName = object.getString("cInvName");
+                //订单重量
+                BigDecimal weight = new BigDecimal(object.getString("iQuantity"));
+                //单价
+                BigDecimal price = new BigDecimal(object.getString("iTaxUnitPrice"));
+                //业务员
+                String businessName = object.getString("cPsn_Name");
+                //根据关联id查询销售订单是否存在，不存在插入
+                long count = this.count(new QueryWrapper<BizSaleOrder>().lambda().eq(BizSaleOrder::getRelationId, relationId));
+                if(count==0){
+                    BizSaleOrder bizSaleOrder = new BizSaleOrder();
+                    bizSaleOrder.setSaleOrderNumber(orderCode);
+                    bizSaleOrder.setSaleGoodsName(goodsName);
+                    bizSaleOrder.setSaleGoodsCode(goodsCode);
+                    bizSaleOrder.setSaleOrderWeight(weight.multiply(new BigDecimal(1000)));
+                    bizSaleOrder.setSaleStatus("1");
+                    bizSaleOrder.setSaleOrderType("1");
+                    bizSaleOrder.setCustomerId(bizCustomer.getId());
+                    bizSaleOrder.setRelationId(relationId);
+                    bizSaleOrder.setSalePrice(price);
+                    bizSaleOrder.setBusinessName(businessName);
+                    this.save(bizSaleOrder);
+                }
+                //添加货品信息
+                QueryWrapper<BizGoods> queryWrapper = new QueryWrapper<>();
+                if(ObjectUtil.isNotEmpty(goodsCode)){
+                    queryWrapper.lambda().eq(BizGoods::getGoodsCode,goodsCode);
+                }
+                if(ObjectUtil.isNotEmpty(goodsName)){
+                    queryWrapper.lambda().eq(BizGoods::getGoodsName,goodsName);
+                }
+                long goodCount = bizGoodsService.count(queryWrapper);
+                if(goodCount==0){
+                    BizGoods bizGoods = new BizGoods();
+                    bizGoods.setGoodsCode(goodsCode);
+                    bizGoods.setGoodsName(goodsName);
+                    bizGoodsService.save(bizGoods);
+                }
+            }
+        }
+        List<BizSaleOrder> list = this.queryByCustomerId(bizSaleOrderIdParam);
+        return list;
+    }
+
+    public static String getSign(String appId,String appSecret,String nonce,String timestamp){
+        StringBuffer buffer = new StringBuffer();
+        buffer.append("appId=").append(appId).append("&");
+        buffer.append("appSecret=").append(appSecret).append("&");
+        buffer.append("nonce=").append(nonce).append("&");
+        buffer.append("timestamp=").append(timestamp).append("&");
+        String sign = MD5.md5(buffer.toString());
+        return sign;
+    }
+
+    public static void main(String[] args) {
+        /*String sign = getSign("0ol2749zps9xhid1","e4w9ylwk7grdsdzpbcq8kcedg7ailh1c",
+                "21459479202627653","1746577107");
+        System.out.printf("sign:"+sign);*/
+        BizSaleOrderIdParam bizSaleOrderIdParam = new BizSaleOrderIdParam();
+        bizSaleOrderIdParam.setId("02002");
+        //queryErp(bizSaleOrderIdParam);
+    }
 }

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/customer/service/impl/BizCustomerServiceImpl.java

@@ -273,8 +273,8 @@ public class BizCustomerServiceImpl extends ServiceImpl<BizCustomerMapper, BizCu
     public static void main(String[] args) {
         StringBuffer buffer = new StringBuffer();
         buffer.append("appKey=").append("0ol2749zps9xhid1&").
-                append("appSecret=e4w9ylwk7grdsdzpbcq8kcedg7ailh1c&").append("nonce=1241455595&")
-                .append("timestamp=1745807175&");
+                append("appSecret=e4w9ylwk7grdsdzpbcq8kcedg7ailh1c&").append("nonce=1241455592&")
+                .append("timestamp=1746524215&");
         System.out.printf(MD5.md5(buffer.toString()));
     }
 }

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/record/service/impl/BizRecordServiceImpl.java

@@ -662,6 +662,19 @@ public class BizRecordServiceImpl extends ServiceImpl<BizRecordMapper, BizRecord
             }
             bizAppointmentRecordService.updateById(appointmentRecord);
         }
+
+        //查询物流订单信息
+        BizOrder bizOrder = bizOrderService.getById(bizRecord.getOrderId());
+        if(ObjectUtil.isNotNull(bizOrder)){
+            if(StringUtils.equals(bizOrder.getOrderType(),"1")){
+                //常规订单
+                if(ObjectUtil.isEmpty(bizOrder.getShippingWeight())){
+                    bizOrder.setShippingWeight(new BigDecimal(0));
+                }
+                bizOrder.setShippingWeight(bizOrder.getShippingWeight().add(bizRecordEditParam.getUnloadWeight().multiply(new BigDecimal(1000))));
+                bizOrderService.updateById(bizOrder);
+            }
+        }
     }
 
     public static void main(String[] args) {