erp对接销售订单

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

@@ -7,22 +7,23 @@
 						<a-input v-model:value="searchFormState.orderNumber" placeholder="订单编号查询" />
 					</a-form-item>
 				</a-col>
-				<a-col :span="6">
+<!--				<a-col :span="6">
 					<a-form-item label="订单名称" name="orderName">
 						<a-input v-model:value="searchFormState.orderName" placeholder="订单名称查询" />
 					</a-form-item>
-				</a-col>
+				</a-col>-->
 				<a-col :span="6">
 					<a-form-item label="车牌号" name="licenseNumber">
 						<a-input v-model:value="searchFormState.licenseNumber" placeholder="车牌号码查询" />
 					</a-form-item>
 				</a-col>
+				<a-col :span="6">
+					<a-form-item label="客户名称" name="customerName">
+						<a-input v-model:value="searchFormState.customerName" placeholder="客户名称查询" />
+					</a-form-item>
+				</a-col>
 				<template v-if="advanced">
-					<a-col :span="6">
-						<a-form-item label="客户名称" name="customerName">
-							<a-input v-model:value="searchFormState.customerName" placeholder="客户名称查询" />
-						</a-form-item>
-					</a-col>
+
 					<a-col :span="6">
 						<a-form-item label="货品名称" name="goodsName">
 							<a-input v-model:value="searchFormState.goodsName" placeholder="货品名称查询" />
@@ -268,10 +269,16 @@
 	}
 
 	const columns = [
-		{
+		/*{
 			title: '订单信息',
 			dataIndex: 'orderInfo',
 			width:200
+		},*/
+		{
+			title: '订单编号',
+			dataIndex: 'orderNumber',
+			align:'center',
+			width:150
 		},
 		{
 			title: '车牌号',

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

@@ -26,16 +26,26 @@
 						  :options="saleOrderInfoList" @change="onChangeSaleOrder"
 				> </a-select>
 			</a-form-item>
+<!--			<a-form-item label="订单类型：" name="orderType" style="display:none">
+				<a-select v-model:value="formData.orderType" placeholder="请选择订单类型"
+						  :options="orderTypeList"
+				> </a-select>
+			</a-form-item>-->
+			<a-form-item label="订单类型：" name="orderType">
+				<a-radio-group button-style="solid" v-model:value="formData.orderType">
+					<a-radio-button value="1">
+						包运订单
+					</a-radio-button>
+					<a-radio-button value="2">
+						自提订单
+					</a-radio-button>
+				</a-radio-group>
+			</a-form-item>
 			<a-form-item label="提货时间：" name="deliveryTimeId" >
 				<a-select v-model:value="formData.deliveryTimeId" placeholder="请选择提货时间"
 						  :options="deliveryTimeIdList"
 				> </a-select>
 			</a-form-item>
-			<a-form-item label="订单类型：" name="orderType" style="display:none">
-				<a-select v-model:value="formData.orderType" placeholder="请选择订单类型"
-						  :options="orderTypeList"
-				> </a-select>
-			</a-form-item>
 			<a-form-item label="订单重量：" name="orderWeight">
 				<a-input-number v-model:value="formData.orderWeight" style="width:90%"  :precision="2" :min="1" :max="999999"  placeholder="请输入订单重量" allow-clear disabled/><span style="margin-left:10px;">吨</span>
 			</a-form-item>
@@ -150,7 +160,7 @@
 			formData.value.goodsName = res.saleGoodsName
 			formData.value.goodsCode = res.saleGoodsCode
 			formData.value.orderWeight = res.saleOrderWeight
-			formData.value.orderType = res.saleOrderType
+			//formData.value.orderType = res.saleOrderType
 			formData.value.deliveryTimeId = ''
 			//根据货品名称和重量查询提货时间段
 			console.log("goodsName:"+formData.value.goodsName)
@@ -185,6 +195,7 @@
 		saleOrderInfo:[required('请选择订单信息')],
 		deliveryTimeId: [required('请选择提货时间')],
 		orderWeight: [required('请输入订单重量')],
+		orderType: [required('请选择订单类型')],
 	}
 	// 验证并提交数据
 	const onSubmit = () => {

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

@@ -7,22 +7,23 @@
 						<a-input v-model:value="searchFormState.orderNumber" placeholder="订单编号查询" />
 					</a-form-item>
 				</a-col>
-				<a-col :span="6">
+<!--				<a-col :span="6">
 					<a-form-item label="订单名称" name="orderName">
 						<a-input v-model:value="searchFormState.orderName" placeholder="订单名称查询" />
 					</a-form-item>
-				</a-col>
+				</a-col>-->
 				<a-col :span="6">
 					<a-form-item label="客户名称" name="customerName">
 						<a-input v-model:value="searchFormState.customerName" placeholder="客户名称查询" />
 					</a-form-item>
 				</a-col>
+				<a-col :span="6">
+					<a-form-item label="货品名称" name="goodsName">
+						<a-input v-model:value="searchFormState.goodsName" placeholder="货品名称查询" />
+					</a-form-item>
+				</a-col>
 				<template v-if="advanced">
-					<a-col :span="6">
-						<a-form-item label="货品名称" name="goodsName">
-							<a-input v-model:value="searchFormState.goodsName" placeholder="货品名称查询" />
-						</a-form-item>
-					</a-col>
+
 					<a-col :span="6">
 						<a-form-item label="订单状态" name="orderStatus">
 							<a-select v-model:value="searchFormState.orderStatus" placeholder="订单状态查询"

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

@@ -7,22 +7,23 @@
 						<a-input v-model:value="searchFormState.orderNumber" placeholder="订单编号查询" />
 					</a-form-item>
 				</a-col>
-				<a-col :span="6">
+<!--				<a-col :span="6">
 					<a-form-item label="订单名称" name="orderName">
 						<a-input v-model:value="searchFormState.orderName" placeholder="订单名称查询" />
 					</a-form-item>
-				</a-col>
+				</a-col>-->
 				<a-col :span="6">
 					<a-form-item label="车牌号" name="licenseNumber">
 						<a-input v-model:value="searchFormState.licenseNumber" placeholder="车牌号码查询" />
 					</a-form-item>
 				</a-col>
+				<a-col :span="6">
+					<a-form-item label="客户名称" name="customerName">
+						<a-input v-model:value="searchFormState.customerName" placeholder="客户名称查询" />
+					</a-form-item>
+				</a-col>
 				<template v-if="advanced">
-					<a-col :span="6">
-						<a-form-item label="客户名称" name="customerName">
-							<a-input v-model:value="searchFormState.customerName" placeholder="客户名称查询" />
-						</a-form-item>
-					</a-col>
+
 					<a-col :span="6">
 						<a-form-item label="货品名称" name="goodsName">
 							<a-input v-model:value="searchFormState.goodsName" placeholder="货品名称查询" />
@@ -193,10 +194,16 @@
 	}
 
 	const columns = [
-		{
+		/*{
 			title: '订单信息',
 			dataIndex: 'orderInfo',
 			width:200
+		},*/
+		{
+			title: '订单信息',
+			dataIndex: 'orderNumber',
+			align:'center',
+			width:150
 		},
 		{
 			title: '车牌号',

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

@@ -21,10 +21,10 @@
 			<a-form-item label="订单类型：" name="saleOrderType">
 				<a-radio-group button-style="solid" v-model:value="formData.saleOrderType">
 					<a-radio-button value="1">
-						常规订单
+						包运订单
 					</a-radio-button>
 					<a-radio-button value="2">
-						服务订单
+						自提订单
 					</a-radio-button>
 				</a-radio-group>
 			</a-form-item>

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

@@ -7,11 +7,11 @@
 						<a-input v-model:value="searchFormState.saleOrderNumber" placeholder="订单编号查询" />
 					</a-form-item>
 				</a-col>
-				<a-col :span="6">
+<!--				<a-col :span="6">
 					<a-form-item label="订单名称" name="saleOrderName">
 						<a-input v-model:value="searchFormState.saleOrderName" placeholder="订单名称查询" />
 					</a-form-item>
-				</a-col>
+				</a-col>-->
 				<a-col :span="6">
 					<a-form-item label="订单类型" name="saleOrderType">
 						<a-select v-model:value="searchFormState.saleOrderType" placeholder="订单类型查询"
@@ -20,20 +20,22 @@
 					</a-form-item>
 				</a-col>
 
+				<a-col :span="6">
+					<a-form-item label="货品名称" name="saleGoodsName">
+						<a-input v-model:value="searchFormState.saleGoodsName" placeholder="货品名称查询" />
+					</a-form-item>
+				</a-col>
+
 				<template v-if="advanced">
-					<a-col :span="6">
-						<a-form-item label="货品名称" name="saleGoodsName">
-							<a-input v-model:value="searchFormState.saleGoodsName" placeholder="货品名称查询" />
-						</a-form-item>
-					</a-col>
+
 				</template>
 				<a-col :span="6">
 					<a-button type="primary" @click="tableRef.refresh()">查询</a-button>
 					<a-button style="margin: 0 8px" @click="reset">重置</a-button>
-					<a @click="toggleAdvanced" style="margin-left: 8px">
+<!--					<a @click="toggleAdvanced" style="margin-left: 8px">
 						{{ advanced ? '收起' : '展开' }}
 						<component :is="advanced ? 'up-outlined' : 'down-outlined'" />
-					</a>
+					</a>-->
 				</a-col>
 			</a-row>
 		</a-form>

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

@@ -60,11 +60,11 @@
 						<a-input v-model:value="searchFormState.orderNumber" placeholder="请输入订单编号" />
 					</a-form-item>
 				</a-col>
-				<a-col :span="6" v-show="advanced">
+<!--				<a-col :span="6" v-show="advanced">
 					<a-form-item label="订单名称" name="orderName">
 						<a-input v-model:value="searchFormState.orderName" placeholder="请输入订单名称" />
 					</a-form-item>
-				</a-col>
+				</a-col>-->
 				<a-col :span="6" v-show="advanced">
 					<a-form-item label="客户名称" name="customerName">
 						<a-input v-model:value="searchFormState.customerName" placeholder="请输入客户名称" />
@@ -237,9 +237,14 @@
 			dataIndex: 'weight',
 			align: 'center'
 		},
-		{
+		/*{
 			title: '订单信息',
 			dataIndex: 'orderInfo'
+		},*/
+		{
+			title: '订单编号',
+			dataIndex: 'orderNumber',
+			align:'center'
 		},
 		{
 			title: '客户名称',
@@ -253,7 +258,7 @@
 		{
 			title: '司机信息',
 			dataIndex: 'driver',
-			width: '200px'
+			width: '150px'
 		}
 	]
 	// 操作栏通过权限判断是否显示

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

@@ -2,11 +2,11 @@
 	<a-card>
 		<a-form ref="searchFormRef" name="advanced_search" :model="searchFormState" class="ant-advanced-search-form">
 			<a-row :gutter="24">
-				<a-col :span="6">
+<!--				<a-col :span="6">
 					<a-form-item label="订单名称" name="orderName">
 						<a-input v-model:value="searchFormState.orderName" placeholder="订单名称查询" />
 					</a-form-item>
-				</a-col>
+				</a-col>-->
 				<a-col :span="6">
 					<a-form-item label="订单编号" name="orderNumber">
 						<a-input v-model:value="searchFormState.orderNumber" placeholder="订单编号查询" />

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

@@ -69,11 +69,11 @@
 							<a-input v-model:value="searchFormState.orderNumber" placeholder="请输入订单编号" />
 						</a-form-item>
 					</a-col>
-					<a-col :span="6" v-show="advanced">
+<!--					<a-col :span="6" v-show="advanced">
 						<a-form-item label="订单名称" name="orderName">
 							<a-input v-model:value="searchFormState.orderName" placeholder="请输入订单名称" />
 						</a-form-item>
-					</a-col>
+					</a-col>-->
 					<a-col :span="6" v-show="advanced">
 						<a-form-item label="客户名称" name="customerName">
 							<a-input v-model:value="searchFormState.customerName" placeholder="请输入客户名称" />
@@ -234,9 +234,14 @@
 			dataIndex: 'weight',
 			align: 'center'
 		},
-		{
+		/*{
 			title: '订单信息',
 			dataIndex: 'orderInfo'
+		},*/
+		{
+			title: '订单编号',
+			dataIndex: 'orderNumber',
+			align:'center'
 		},
 		{
 			title: '客户名称',
@@ -250,7 +255,7 @@
 		{
 			title: '司机信息',
 			dataIndex: 'driver',
-			width: '200px'
+			width: '150px'
 		}
 	]
 	// 操作栏通过权限判断是否显示

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

@@ -79,4 +79,7 @@ public class BizSaleOrder extends CommonEntity {
     /***业务员*/
     private String businessName;
 
+    /**来源*/
+    private String saleOrderSouce;
+
 }

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

@@ -16,6 +16,7 @@ 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.HttpException;
 import cn.hutool.http.HttpUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -46,6 +47,7 @@ import vip.xiaonuo.biz.modular.bizsaleorder.service.BizSaleOrderService;
 
 import javax.annotation.RegEx;
 import java.math.BigDecimal;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -201,63 +203,70 @@ public class BizSaleOrderServiceImpl extends ServiceImpl<BizSaleOrderMapper, Biz
         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);
+        try {
+            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.setSaleOrderSouce("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;
+        } catch (HttpException e) {
+            //throw new CommonException("erp服务网络异常！");
+            List<BizSaleOrder> list = this.queryByCustomerId(bizSaleOrderIdParam);
+            return list;
         }
-        List<BizSaleOrder> list = this.queryByCustomerId(bizSaleOrderIdParam);
-        return list;
     }
 
     public static String getSign(String appId,String appSecret,String nonce,String timestamp){
@@ -271,11 +280,11 @@ public class BizSaleOrderServiceImpl extends ServiceImpl<BizSaleOrderMapper, Biz
     }
 
     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");
+        String sign = getSign("0ol2749zps9xhid1","e4w9ylwk7grdsdzpbcq8kcedg7ailh1c",
+                "21459479202627653","1746664070");
+        System.out.printf("sign:"+sign);
+        /*BizSaleOrderIdParam bizSaleOrderIdParam = new BizSaleOrderIdParam();
+        bizSaleOrderIdParam.setId("02002");*/
         //queryErp(bizSaleOrderIdParam);
     }
 }