xwh提交代码

wms-center/src/main/java/com/lote/wms/user/user/controller/UserOrgController.java

@@ -2,6 +2,7 @@ package com.lote.wms.user.user.controller;
 
 import java.util.Date;
 import java.util.List;
+import java.util.Objects;
 
 import javax.annotation.Resource;
 
@@ -65,6 +66,9 @@ public class UserOrgController extends AbstractController {
 		if (StringUtil.isEmpty(userOrg.getName())) {
 			return Result.error("机构名称不能为空");
 		}
+		if(Objects.isNull(userOrg.getParentId()) || "".equals(userOrg.getParentId())){
+			userOrg.setParentId("0");
+		}
 		String userId = (String) this.getSession().getAttr(SessionAttrConstant.ID);
 		String userCode = (String) this.getSession().getAttr(SessionAttrConstant.CODE);
 		userOrg.setCreatedByUserId(userId);

wms-center/src/main/resources/mybatis/mapper/user/customer/CustomerContactMapper.xml

@@ -86,6 +86,11 @@
       limit ${start} , ${limit}
     </if>
   </select>
+  <select id="selectAll" resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List" />
+    from u_customer_contact
+  </select>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
     select 
     <include refid="Base_Column_List" />

wms-core-service/src/main/java/com/lote/wms/api/standard/entity/outstock/OutOrderDto.java

@@ -1,6 +1,7 @@
 package com.lote.wms.api.standard.entity.outstock;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 
@@ -146,6 +147,26 @@ public class OutOrderDto implements Serializable {
 
 	private String shippingStatus;
 
+	private BigDecimal insuredPrice;
+
+	private BigDecimal preservationPrice;
+
+	public BigDecimal getInsuredPrice() {
+		return insuredPrice;
+	}
+
+	public void setInsuredPrice(BigDecimal insuredPrice) {
+		this.insuredPrice = insuredPrice;
+	}
+
+	public BigDecimal getPreservationPrice() {
+		return preservationPrice;
+	}
+
+	public void setPreservationPrice(BigDecimal preservationPrice) {
+		this.preservationPrice = preservationPrice;
+	}
+
 	private static final long serialVersionUID = 1L;
 
 	public OutOrderDto() {

wms-core-service/src/main/java/com/lote/wms/api/standard/service/outstock/impl/OutstockHandlerServiceImpl.java

@@ -3,6 +3,7 @@ package com.lote.wms.api.standard.service.outstock.impl;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Objects;
 
 import javax.annotation.Resource;
 
@@ -137,6 +138,12 @@ public class OutstockHandlerServiceImpl implements OutstockStandardService {
 		outOrder.setStatusCombinationName(OutOrderStatusCombinationEnum.UNASSIGNED.getName());
 		outOrder.setBusinessTypeCode(OutOrderBusinessTypeEnum.WMS.getCode());
 		outOrder.setBusinessTypeName(OutOrderBusinessTypeEnum.WMS.getName());
+		if (Objects.nonNull(orderDto.getInsuredPrice())){
+			outOrder.setInsuredPrice(orderDto.getInsuredPrice());
+		}
+		if (Objects.nonNull(orderDto.getPreservationPrice())){
+			outOrder.setPreservationPrice(orderDto.getPreservationPrice());
+		}
 
 		OutOrderFeeDto feeDto = orderDto.getOrderFee();
 		OutOrderFee outOrderFee = null;

wms-core-service/src/main/java/com/lote/wms/outstock/order/entity/OutOrder.java

@@ -1,6 +1,7 @@
 package com.lote.wms.outstock.order.entity;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.Date;
 
 public class OutOrder implements Serializable {
@@ -254,6 +255,26 @@ public class OutOrder implements Serializable {
 
     private String customerName;
 
+    private BigDecimal insuredPrice;
+
+    private BigDecimal preservationPrice;
+
+    public BigDecimal getInsuredPrice() {
+        return insuredPrice;
+    }
+
+    public void setInsuredPrice(BigDecimal insuredPrice) {
+        this.insuredPrice = insuredPrice;
+    }
+
+    public BigDecimal getPreservationPrice() {
+        return preservationPrice;
+    }
+
+    public void setPreservationPrice(BigDecimal preservationPrice) {
+        this.preservationPrice = preservationPrice;
+    }
+
     private static final long serialVersionUID = 1L;
 
     public OutOrder() {

wms-core-service/src/main/resources/mybatis/mapper/outstock/order/OutOrderMapper.xml

@@ -127,6 +127,8 @@
     <result column="bill_weight" property="billWeight" jdbcType="DOUBLE" />
     <result column="warehouse_name" property="warehouseName" jdbcType="VARCHAR" />
     <result column="customer_name" property="customerName" jdbcType="VARCHAR" />
+    <result column="insured_price" property="insuredPrice" jdbcType="DECIMAL" />
+    <result column="preservation_price" property="preservationPrice" jdbcType="DECIMAL" />
   </resultMap>
   <sql id="Condition_Where_Clause" >
     <where >
@@ -179,7 +181,7 @@
     callback_weigh_time, is_callback_trackingno_success, callback_trackingno_result, 
     callback_trackingno_time, api_data_extend, is_shortage, is_repeat_purchase, address_digest, 
     repeat_purchase_order_no, last_trace, problem_type_code, problem_type_name, problem_remark, 
-    is_problem, is_vali_box, volume_weight, bill_weight, warehouse_name, customer_name
+    is_problem, is_vali_box, volume_weight, bill_weight, warehouse_name, customer_name,insured_price,preservation_price
   </sql>
   <select id="selectByConditionList" resultMap="BaseResultMap" parameterType="com.lote.wms.outstock.order.entity.OutOrderCriteria" >
     select

wms-operate/src/main/java/com/lote/wms/controller/operate/user/user/UserOrgController.java

@@ -19,6 +19,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import javax.annotation.Resource;
 import java.util.Date;
 import java.util.List;
+import java.util.Objects;
 
 @Controller
 @RequestMapping("/user/org")
@@ -63,6 +64,9 @@ public class UserOrgController extends AbstractController {
 		if (StringUtil.isEmpty(userOrg.getName())) {
 			return Result.error("机构名称不能为空");
 		}
+		if(Objects.isNull(userOrg.getParentId()) || "".equals(userOrg.getParentId())){
+			userOrg.setParentId("0");
+		}
 		String userId = (String) this.getSession().getAttr(SessionAttrConstant.ID);
 		String userCode = (String) this.getSession().getAttr(SessionAttrConstant.CODE);
 		userOrg.setCreatedByUserId(userId);

wms-operate/src/main/resources/static/ui/js/inventory/inventory/inventory/list.js

@@ -585,7 +585,7 @@ $("#freezeQty").iMenubutton({
 	     		$.iMessager.progress({text: '正在提交中....'});
 	    		$.ajax({
     			   method:"POST",
-    			   url: "/inventory/inventory/freezeQty.json",
+    			   url: "/inventory/inventory/freezeQty",
     			   data: JSON.stringify(data),
     			   dataType:"json",
     			   contentType:"application/json; charset=UTF8",