erp对接销售订单

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

@@ -31,8 +31,8 @@
 						  :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-form-item label="订单类型：" name="orderType" >
+				<a-radio-group button-style="solid" v-model:value="formData.orderType" disabled>
 					<a-radio-button value="1">
 						包运订单
 					</a-radio-button>
@@ -160,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)
@@ -221,3 +221,17 @@
 		onOpen
 	})
 </script>
+
+<style>
+/* 修改禁用状态下的颜色 */
+.ant-radio-button-wrapper-disabled {
+	color: black !important; /* 设置文字颜色 */
+	background-color: #f0f0f0 !important; /* 设置背景颜色 */
+}
+
+/* 修改禁用状态下选中项的颜色 */
+.ant-radio-button-wrapper-checked.ant-radio-button-wrapper-disabled {
+	color: white !important; /* 设置文字颜色 */
+	background-color: blue !important; /* 设置选中项的背景颜色 */
+}
+</style>

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

@@ -225,6 +225,8 @@ public class BizSaleOrderServiceImpl extends ServiceImpl<BizSaleOrderMapper, Biz
                     BigDecimal price = new BigDecimal(object.getString("iTaxUnitPrice"));
                     //业务员
                     String businessName = object.getString("cPsn_Name");
+                    //订单类型
+                    String transWay = object.getString("transWay");
                     //根据关联id查询销售订单是否存在，不存在插入
                     long count = this.count(new QueryWrapper<BizSaleOrder>().lambda().eq(BizSaleOrder::getRelationId, relationId));
                     if(count==0){
@@ -234,7 +236,13 @@ public class BizSaleOrderServiceImpl extends ServiceImpl<BizSaleOrderMapper, Biz
                         bizSaleOrder.setSaleGoodsCode(goodsCode);
                         bizSaleOrder.setSaleOrderWeight(weight.multiply(new BigDecimal(1000)));
                         bizSaleOrder.setSaleStatus("1");
-                        bizSaleOrder.setSaleOrderType("1");
+                        if(ObjectUtil.isNotEmpty(transWay)){
+                            if(StringUtils.equals(transWay,"配送")){
+                                bizSaleOrder.setSaleOrderType("1");
+                            }else{
+                                bizSaleOrder.setSaleOrderType("2");
+                            }
+                        }
                         bizSaleOrder.setSaleOrderSouce("1");
                         bizSaleOrder.setCustomerId(bizCustomer.getId());
                         bizSaleOrder.setRelationId(relationId);