Merge branch 'master' of http://git.iamberry.com/hexiugang/iamberry-common-parent

watero-rst-core/src/main/java/com.iamberry.rst.core/cm/SalesOrder.java

@@ -62,6 +62,7 @@ public class SalesOrder implements Serializable {
     private String salesOrderStatusProcTypeName;       //订单状态 订单状态：1：正常 2：换货 3：退货  4:维修  5：补发 -- TODO: 2019/1/4 改为 ProcTypeId
     private Integer salesShippingStatus;    //发货状态 0(未发货)1(已发货,即已扫描出库)3(备货中)4（收货） 11(已通知配货，后加)
     private Integer salesDeliver;            //出库状态  1：未出库   2：已出库
+    private Integer salesOldDeliver;            //过去的状态 - 出库状态  1：未出库   2：已出库
     private Date salesDeliverTime;            //出库时间
     private Integer salesPayStatus;         //付款状态 0(未付款)2(已付款)
     private Integer salesProcessStatus;     //单据状态  0(正常单)1(问题单)
@@ -695,6 +696,14 @@ public class SalesOrder implements Serializable {
         this.salesDeliver = salesDeliver;
     }
 
+    public Integer getSalesOldDeliver() {
+        return salesOldDeliver;
+    }
+
+    public void setSalesOldDeliver(Integer salesOldDeliver) {
+        this.salesOldDeliver = salesOldDeliver;
+    }
+
     public String getSalesAdminName() {
         return salesAdminName;
     }

watero-rst-core/src/main/java/com.iamberry.rst.core/fm/SignclosedProductInfo.java

@@ -24,6 +24,7 @@ public class SignclosedProductInfo implements Serializable {
     private Integer signclosedState;//签收状态 1待签收 2已签收
     private String colorName;//颜色名称
     private String productNumber;//产品型号
+    private String colorBar;//产品sku
     private Integer colorPrice;//产品价格
 
     public Integer getProductId() {
@@ -137,4 +138,12 @@ public class SignclosedProductInfo implements Serializable {
     public void setColorPrice(Integer colorPrice) {
         this.colorPrice = colorPrice;
     }
+
+    public String getColorBar() {
+        return colorBar;
+    }
+
+    public void setColorBar(String colorBar) {
+        this.colorBar = colorBar;
+    }
 }

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/SalesOrderServiceImpl.java

@@ -1082,21 +1082,23 @@ public class SalesOrderServiceImpl implements SalesOrderService {
 
     @Transactional
     @Override
-    public Integer updateDeliver(SalesOrder salesOrder) {
+    public synchronized Integer updateDeliver(SalesOrder salesOrder) {
+        Integer flag = salesOrderMapper.updateDeliver(salesOrder);
+        if(flag < 1){
+            throw new RuntimeException("出库失败,订单出库失败。");
+        }
+
         if(salesOrder.getSalesDeliver() == 2){//标记出库，修改库存
             if(!salesOrderService.updateInventory(salesOrder.getSalesId(),salesOrder.getSalesWarehouseId())){
-                return 0;
+                throw new RuntimeException("出库失败,【出库】库存修改失败。");
             }
         }
+
         if(salesOrder.getSalesDeliver() == 1){//标记未出库，修改库存
             if(!salesOrderService.returnInventory(salesOrder.getSalesId(),salesOrder.getSalesWarehouseId())){
-                return 0;
+                throw new RuntimeException("出库失败,【返还库存】库存修改失败。");
             }
         }
-        Integer flag = salesOrderMapper.updateDeliver(salesOrder);
-        if(flag < 1){
-            throw new RuntimeException("出库失败,订单出库失败。");
-        }
         return flag;
     }
 
@@ -1119,7 +1121,7 @@ public class SalesOrderServiceImpl implements SalesOrderService {
             if(info != null){
                 if(info.getInventoryGoodProductNum() >= item.getItemNum()){
                     info.setInventoryGoodProductNum(info.getInventoryGoodProductNum() - item.getItemNum());
-                    info.setInventoryRecentRecord(sdf.format(new Date())+"出库："+item.getItemNum()+"件");
+                    info.setInventoryRecentRecord(sdf.format(new Date())+"出库："+item.getItemNum()+"件,订单号："+item.getItemOrderId());
                     Integer flag =  inventoryMapper.updateById(info);
                     if(flag < 1){
                         throw new RuntimeException("【出库】更新库存失败，库存修改失败。");
@@ -1131,18 +1133,18 @@ public class SalesOrderServiceImpl implements SalesOrderService {
                     inventoryLog.setLogRemainingNum(item.getItemNum());
                     inventoryLog.setLogType(2);
                     inventoryLog.setLogOperationType(2);
-                    inventoryLog.setLogDesc(sdf.format(new Date())+"待发货标记出库："+item.getItemNum()+"件");
+                    inventoryLog.setLogDesc(sdf.format(new Date())+"待发货标记出库："+item.getItemNum()+"件,订单号："+item.getItemOrderId());
                     inventoryLog.setLogQualityType(1);
                     inventoryLog.setLogWarehouseId(salesWarehouseId);
                     flag = inventoryLogMapper.insert(inventoryLog);
                     if(flag < 1){
-                        throw new RuntimeException("更新库存失败，增加库存记录失败。");
+                        throw new RuntimeException("【出库】更新库存失败，增加库存记录失败。");
                     }
                 }else{
-                    throw new RuntimeException("更新库存失败，"+ warehouseName +"["+ item.getItemProductName()+ "("+ item.getItemProductColor() +")" +"]库存不足。");
+                    throw new RuntimeException("【出库】更新库存失败，"+ warehouseName +"["+ item.getItemProductName()+ "("+ item.getItemProductColor() +")" +"]库存不足。");
                 }
             }else{
-                throw new RuntimeException("更新库存失败，未查询到库存信息，请确认“"+ warehouseName +"”是否有该产品["+ item.getItemProductName()+ "("+ item.getItemProductColor() +")" +"]库存信息。");
+                throw new RuntimeException("【出库】更新库存失败，未查询到库存信息，请确认“"+ warehouseName +"”是否有该产品["+ item.getItemProductName()+ "("+ item.getItemProductColor() +")" +"]库存信息。");
             }
         }
         return true;
@@ -1153,7 +1155,7 @@ public class SalesOrderServiceImpl implements SalesOrderService {
     public boolean returnInventory(Integer salesId,Integer salesWarehouseId){
         OrderWarehouse orderWarehouse = orderWarehouseService.getOrderWarehouseById(salesWarehouseId);
         if(orderWarehouse == null){
-            throw new RuntimeException("【出库】更新库存失败，查询仓库信息失败。");
+            throw new RuntimeException("【返还库存】更新库存失败，查询仓库信息失败。");
         }
         String warehouseName = orderWarehouse.getWarehouseName();
 
@@ -1165,7 +1167,7 @@ public class SalesOrderServiceImpl implements SalesOrderService {
             InventoryInfo info = inventoryMapper.getByInventoryByBar(item.getItemColorBar(),salesWarehouseId);
             if(info != null){
                 info.setInventoryGoodProductNum(info.getInventoryGoodProductNum() + item.getItemNum());
-                info.setInventoryRecentRecord(sdf.format(new Date())+"删除/作废/标记未出库时订单返还库存："+item.getItemNum()+"件");
+                info.setInventoryRecentRecord(sdf.format(new Date())+"删除/作废/标记未出库时订单返还库存："+item.getItemNum()+"件,订单号："+item.getItemOrderId());
                 Integer flag = inventoryMapper.updateById(info);
                 if(flag < 1){
                     throw new RuntimeException("【返还库存】更新库存失败，库存修改失败。");
@@ -1177,15 +1179,15 @@ public class SalesOrderServiceImpl implements SalesOrderService {
                 inventoryLog.setLogRemainingNum(item.getItemNum());
                 inventoryLog.setLogType(1);
                 inventoryLog.setLogOperationType(1);
-                inventoryLog.setLogDesc(sdf.format(new Date())+"删除/作废/标记未出库时订单返还库存："+item.getItemNum()+"件");
+                inventoryLog.setLogDesc(sdf.format(new Date())+"删除/作废/标记未出库时订单返还库存："+item.getItemNum()+"件,订单号："+item.getItemOrderId());
                 inventoryLog.setLogQualityType(1);
                 inventoryLog.setLogWarehouseId(salesWarehouseId);
                 flag = inventoryLogMapper.insert(inventoryLog);
                 if(flag < 1){
-                    throw new RuntimeException("更新库存失败，增加库存记录失败。");
+                    throw new RuntimeException("【返还库存】更新库存失败，增加库存记录失败。");
                 }
             }else{
-                throw new RuntimeException("更新库存失败，未查询到库存信息，请确认“"+ warehouseName +"”是否有该产品["+ item.getItemProductName()+ "("+ item.getItemProductColor() +")" +"]库存信息。");
+                throw new RuntimeException("【返还库存】更新库存失败，未查询到库存信息，请确认“"+ warehouseName +"”是否有该产品["+ item.getItemProductName()+ "("+ item.getItemProductColor() +")" +"]库存信息。");
             }
 
         }

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/mapper/salesOrderMapper.xml

@@ -1336,6 +1336,7 @@
         WHERE
           sales_post_num = #{salesPostNum}
         AND sales_id = #{salesId}
+        AND sales_deliver = #{salesOldDeliver}
         AND sales_shipping_status = 1
     </update>
 

watero-rst-service/src/main/java/com/iamberry/rst/service/fm/ComplaintDetectInfoServiceImpl.java

@@ -28,6 +28,7 @@ import java.text.MessageFormat;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
+import java.util.Objects;
 
 @Service
 public class ComplaintDetectInfoServiceImpl implements ComplaintDetectInfoService {
@@ -533,6 +534,15 @@ public class ComplaintDetectInfoServiceImpl implements ComplaintDetectInfoServic
 
     @Override
     public Integer updatePrint(ComplaintDetectInfo detectInfo) {
+        ComplaintDetectInfo cdi = complaintDetectInfoMapper.getDetectByIdFast(detectInfo.getDetectId());
+        if(!Objects.equals(cdi.getDetectState(), detectInfo.getDetectState())){ //修改状态时判断状态，来调整库存
+            switch (detectInfo.getDetectState()){    //detectState
+                case 23:
+                    break;
+                default:
+                    break;
+            }
+        }
         return complaintDetectInfoMapper.updateDetectById(detectInfo);
     }
 

watero-rst-service/src/main/java/com/iamberry/rst/service/fm/ComplaintSignclosedInfoServiceImpl.java

@@ -13,10 +13,7 @@ import com.iamberry.rst.core.page.PagedResult;
 import com.iamberry.rst.faces.fm.ComplaintSignclosedInfoService;
 import com.iamberry.rst.faces.sms.SmsService;
 import com.iamberry.rst.service.cm.mapper.*;
-import com.iamberry.rst.service.fm.mapper.AwaitingSignclosedProductMapper;
-import com.iamberry.rst.service.fm.mapper.ComplaintDetectInfoMapper;
-import com.iamberry.rst.service.fm.mapper.ComplaintSignclosedInfoMapper;
-import com.iamberry.rst.service.fm.mapper.ComplaintSignclosedProductInfoMapper;
+import com.iamberry.rst.service.fm.mapper.*;
 import com.iamberry.rst.service.product.mapper.ProductMapper;
 import com.iamberry.rst.util.PageUtil;
 import com.iamberry.rst.util.ProduceNoUtil;
@@ -50,6 +47,10 @@ public class ComplaintSignclosedInfoServiceImpl implements ComplaintSignclosedIn
     @Autowired
     private CustomerInfoMapper customerInfoMapper;
     @Autowired
+    private InventoryMapper inventoryMapper;
+    @Autowired
+    private InventoryLogMapper inventoryLogMapper;
+    @Autowired
     private SmsService smsService;
 
     @Override
@@ -58,6 +59,8 @@ public class ComplaintSignclosedInfoServiceImpl implements ComplaintSignclosedIn
                           String orderItemString,String[] componentsImgs) {
         Integer msg = 0;
         int num = 0;
+        Integer signclosedId = null;
+        Integer flag = 0;
         //查询是否已存在相同单号
         if(record.getSignclosedLogisticsNumber() != null){
             ComplaintSignclosedInfo info = new ComplaintSignclosedInfo();
@@ -78,6 +81,7 @@ public class ComplaintSignclosedInfoServiceImpl implements ComplaintSignclosedIn
             if(sinfoList.size() <= 0){
                 num = complaintSignclosedInfoMapper.insert(record);
                 msg = 1;//添加成功
+                signclosedId = record.getSignclosedId();
             }else{
                 //将签收记录改为已签收
                 ComplaintSignclosedInfo complaintSignclosedInfo = sinfoList.get(0);
@@ -86,6 +90,7 @@ public class ComplaintSignclosedInfoServiceImpl implements ComplaintSignclosedIn
                     complaintSignclosedInfo.setSignclosedDate(new Date());
                     complaintSignclosedInfoMapper.updateSignclosedById(complaintSignclosedInfo);
                     msg = 3;//已存在相同单号的签收信息并修改状态为已签收
+                    signclosedId = complaintSignclosedInfo.getSignclosedId();
                 }else{
                     msg = 4;//已存在相同单号的已签收信息
                 }
@@ -104,7 +109,7 @@ public class ComplaintSignclosedInfoServiceImpl implements ComplaintSignclosedIn
                         SignclosedProductInfo signclosedProductInfo = new SignclosedProductInfo();
                         //根据颜色id获取产品信息获取产品信息
                             ProductColor productColor = productMapper.getProduceColor(salesOrderItem.getItemColorId());
-                            Product product = productMapper.getProduce(productColor.getColorProductId());
+//                            Product product = productMapper.getProduce(productColor.getColorProductId());
                             if(productColor == null){
                                 msg = 2;
                             }
@@ -146,6 +151,35 @@ public class ComplaintSignclosedInfoServiceImpl implements ComplaintSignclosedIn
                     }
                 }
             }
+
+            if(msg == 1 || msg == 3){
+                SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                List<SignclosedProductInfo> signclosedProductInfoList = complaintSignclosedProductInfoMapper.listSignclosedById(signclosedId);
+                for (SignclosedProductInfo spi:signclosedProductInfoList) {
+                    InventoryInfo info = inventoryMapper.getByInventoryByBar(spi.getColorBar(),2);
+                    info.setInventoryDefectiveProductNum(info.getInventoryDefectiveProductNum()+spi.getProductNum());
+                    info.setInventoryRecentRecord(sdf.format(new Date())+"不良品入库："+ spi.getProductNum() + "件");
+                    flag =  inventoryMapper.updateById(info);
+                    if(flag < 1){
+                        throw new RuntimeException("更新库存失败，更新库存失败。");
+                    }
+
+                    //添加日志
+                    InventoryLog inventoryLog = new InventoryLog();
+                    inventoryLog.setLogProductName(info.getInventoryProductName());
+                    inventoryLog.setLogProductBar(info.getInventoryProductBar());
+                    inventoryLog.setLogRemainingNum(spi.getProductNum());
+                    inventoryLog.setLogType(3);
+                    inventoryLog.setLogOperationType(2);
+                    inventoryLog.setLogDesc(sdf.format(new Date())+"不良品入库："+spi.getProductNum()+"件");
+                    inventoryLog.setLogQualityType(2);
+                    inventoryLog.setLogWarehouseId(2);
+                    flag = inventoryLogMapper.insert(inventoryLog);
+                    if(flag < 1){
+                        throw new RuntimeException("更新库存失败，增加库存记录失败。");
+                    }
+                }
+            }
             //添加签收图片
             if(componentsImgs != null) {
                 if (componentsImgs.length > 0) {

watero-rst-service/src/main/java/com/iamberry/rst/service/fm/mapper/ComplaintDetectInfoMapper.java

@@ -14,6 +14,12 @@ public interface ComplaintDetectInfoMapper {
      * @return
      */
     ComplaintDetectInfo getDetectById(Integer detectId);
+
+    /**
+     * 查询单个品质检测产品 - Small
+     * @return
+     */
+    ComplaintDetectInfo getDetectByIdFast(Integer detectId);
     /**
      * 修改单个待品质检测
      * @return

watero-rst-service/src/main/java/com/iamberry/rst/service/fm/mapper/complaintDetectInfoMapper.xml

@@ -78,6 +78,37 @@
     where detect_id = #{detectId,jdbcType=INTEGER}
     GROUP BY c.customer_id
   </select>
+
+  <select id="getDetectByIdFast" resultType="ComplaintDetectInfo" parameterType="java.lang.Integer" >
+    select
+      detect_id detectId,
+      detect_product_number detectProductNumber,
+      detect_state detectState,
+      cd.customer_id customerId,
+      detect_phenomenon detectPhenomenon,
+      detect_classification detectClassification,
+      detect_failure_cause detectFailureCause,
+      detect_results detectResults,
+      detect_point detectPoint,
+      detect_nalysis detectNalysis,
+      detect_content detectContent,
+      detect_desc detectDesc,
+      detect_date detectDate,
+      detect_create_time detectCreateTime,
+      detect_update_time detectUpdateTime,
+      detect_offer detectOffer,
+      detect_renovation detectRenovation,
+      detect_processing_results detectProcessingResults,
+      detect_production detectProduction,
+      detect_fuselage_barcode detectFuselageBarcode,
+      detect_film_type detectFilmType,
+      detect_float_type detectFloatType,
+      detect_version_number detectVersionNumber,
+      detect_is_refurbishing detectIsRefurbishing
+    from tb_rst_complaint_detect cd
+    where detect_id = #{detectId,jdbcType=INTEGER}
+  </select>
+
   <select id="listComplaintDetect" resultType="ComplaintDetectInfo" parameterType="ComplaintDetectInfo" >
     select
     cd.detect_id detectId,

watero-rst-service/src/main/java/com/iamberry/rst/service/fm/mapper/complaintSignclosedProductInfoMapper.xml

@@ -12,7 +12,6 @@
     <result column="signclosed_product_id" property="signclosedProductId" jdbcType="INTEGER" />
     <result column="signclosed_product_color" property="signclosedProductColor" jdbcType="INTEGER" />
     <result column="machine_no" property="machineNo" jdbcType="VARCHAR" />
-
   </resultMap>
   <sql id="Base_Column_List" >
     product_id, signclosed_id, product_name, product_num, signclosed_create_time,
@@ -38,7 +37,8 @@
 	sp.machine_no machineNo,
     pc.color_name colorName,
     pi.product_number productNumber,
-    pc.color_price colorPrice
+    pc.color_price colorPrice,
+    pc.color_bar colorBar
     from
     tb_rst_complaint_signclosed_product sp
     LEFT JOIN tb_rst_product_color pc on sp.signclosed_product_color = pc.color_id

watero-rst-service/src/main/java/com/iamberry/rst/service/fm/mapper/inventoryMapper.xml

@@ -73,6 +73,7 @@
   <select id="listByInventoryId" resultMap="BaseResultMap" parameterType="InventoryInfo" >
     select
     fi.inventory_id,
+    fi.warehouse_id,
     fi.inventory_product_name,
     fi.inventory_product_bar,
     fi.inventory_remaining_num,

watero-rst-web/src/main/java/com/iamberry/rst/controllers/cm/AdminSignclosedController.java

@@ -187,7 +187,17 @@ public class AdminSignclosedController {
         }
         signclosedInfo.setSignclosedCreateTime(new Date());
         signclosedInfo.setSignclosedIsReceiving(2);
-        Integer num = complaintSignclosedInfoService.insert(signclosedInfo,orderItemString,componentsImgs);
+        Integer num = 0;
+        try{
+            num = complaintSignclosedInfoService.insert(signclosedInfo,orderItemString,componentsImgs);
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+        if(num < 1){
+            msg.setResultCode(500);
+            msg.setReturnCode(num);
+            return msg;
+        }
         msg.setResultCode(200);
         msg.setReturnCode(num);
         return msg;

watero-rst-web/src/main/java/com/iamberry/rst/controllers/order/AwaitSendController.java

@@ -620,6 +620,7 @@ public class AwaitSendController {
             return rj;
         }
         salesOrder.setSalesDeliver(2);
+        salesOrder.setSalesOldDeliver(1);
         Integer flag = 0;
         try{
             flag = salesOrderService.updateDeliver(salesOrder);
@@ -796,32 +797,43 @@ public class AwaitSendController {
     @RequiresPermissions("salesOrder:markDeliver:deliverList")
     @RequestMapping("/markDeliver")
     public ResponseJson markDeliver(HttpServletRequest request,Integer salesId, Integer type) {
+        ResponseJson rj = ResponseJson.getFAILURE();
         if(salesId == null || type == null){
             return ResponseJson.getFAILURE();
         }
-        ResponseJson rj = ResponseJson.getSUCCESS();
 
         SalesOrder salesOrder = salesOrderService.getSalesOrderById(salesId);
         if(salesOrder == null){
-            rj.setResultMsg("出货失败，该订单号未查询到订单。");
+            rj.setResultMsg("标记失败，该订单号未查询到订单。");
             return rj;
         }
         if(salesOrder.getSalesShippingStatus() != 1){
-            rj.setResultMsg("出货失败，该订单未发货。");
+            rj.setResultMsg("标记失败，该订单未发货。");
             return rj;
         }
 
+        if(type == salesOrder.getSalesDeliver()){
+            if(type == 1){
+                rj.setResultMsg("标记未出库失败，该订单已标记为未出库。");
+                return rj;
+            }else  if(type == 2){
+                rj.setResultMsg("标记出库失败，该订单已标记为已出库。");
+                return rj;
+            }
+        }
+
+        salesOrder.setSalesOldDeliver(salesOrder.getSalesDeliver());
         salesOrder.setSalesDeliver(type);
         Integer flag = 0;
         try{
             flag = salesOrderService.updateDeliver(salesOrder);
         }catch (Exception e){
-            rj.setResultMsg("出货失败;</br>原因："+e.getMessage());
+            rj.setResultMsg("标记失败;</br>原因："+e.getMessage());
             return rj;
         }
 
         if(flag < 1){
-            rj.setResultMsg("出货失败，请检查该订单的发货状态及产品库存是否充足。");
+            rj.setResultMsg("标记失败，请检查该订单的发货状态及产品库存是否充足。");
             return rj;
         }
         rj = ResponseJson.getSUCCESS();

watero-rst-web/src/main/java/com/iamberry/rst/controllers/pts/InventoryController.java

@@ -140,6 +140,9 @@ public class InventoryController {
         List<WarehouseInfo> warehouseList = inventoryLogService.listFactoryInfo();
         mv.addObject("warehouseList",warehouseList);*/
         StitchAttrUtil.getSa().setModelAndView(inventoryLog, mv, "/admin/inventory/select_inventoryLog_list", result);
+
+        InventoryInfo inventoryInfo = inventoryService.getByInventoryByBar(inventoryLog.getLogProductBar(),inventoryLog.getLogWarehouseId());
+        mv.addObject("inventoryInfo",inventoryInfo);
         return mv;
     }
 

watero-rst-web/src/main/java/com/iamberry/rst/controllers/scm/AdminScmOrderController.java

@@ -300,7 +300,7 @@ public class AdminScmOrderController {
     @ResponseBody
     @RequestMapping("/get_order")
     @RequiresPermissions(value = {"scmOrder:order:add", "scmOrder:update:add", "scmOrder:order:list", "scmOrder:order:send"}, logical = Logical.OR)
-    public ResponseJson addSalesOrder(HttpServletRequest request,ScmOrderInfo scmOrderInfo) throws Exception {
+    public ResponseJson getOrder(HttpServletRequest request,ScmOrderInfo scmOrderInfo) throws Exception {
         if(scmOrderInfo.getOrderId() == null && (scmOrderInfo.getOrderMadeId() == null||"".equals(scmOrderInfo.getOrderMadeId())) &&
                 (scmOrderInfo.getOrderNo() == null || "".equals(scmOrderInfo.getOrderNo()))){
             return new ResponseJson(500, "查询失败", 500);

watero-rst-web/src/main/webapp/WEB-INF/views/cm/inventory/inventoryLog_list.ftl

@@ -29,6 +29,10 @@
             text-overflow: ellipsis;
         }
 
+        .tit-2{position: relative;text-align: left;font-size: 16px;padding-left: 10px;color: #50a2ea;}
+        .tit-2:after{content: '';position: absolute;left: 0;top: 50%;height: 6px;width: 6px;border-radius: 6px;margin-top: -3px; background-color: #32a3d8;}
+
+
     </style>
 </head>
 <body>
@@ -38,6 +42,17 @@
     <a class="btn radius r" href="javascript:location.replace(location.href);" title="刷新" ><i class="Hui-iconfont">&#xe68f;</i></a>
 </nav>
 <div class="page-container">
+
+    <div class="row cl" style="    margin-bottom: 20px;">
+        <label class="form-label col-12">
+            <div class="tit-2">产品名称：${inventoryInfo.inventoryProductName!''}(${inventoryInfo.productColorName!''}-${inventoryInfo.inventoryProductBar!''})</div>
+        </label>
+        <div class="formControls col-9">
+        </div>
+    </div>
+
+    <#--<pre style="font-size: 12px;margin-top: -1%;">产品名称：${inventoryInfo.inventoryProductName!''}(${inventoryInfo.productColorName!''}-${inventoryInfo.inventoryProductBar!''})</pre>-->
+
     <div class="text-c">
         <form name="form1" action="${path}/admin/inventory/select_inventoryLog_list" method="post">
         <#--<input class="my-input" style="width: 70px;" type="text" name="signclosedCustomerId" value="${signclosedCustomerId!}" placeholder="客诉编号"/>
@@ -74,13 +89,14 @@
         <table class="table table-border table-bordered table-bg table-hover table-sort">
             <thead>
             <tr class="text-c">
-                <th width="100">产品名称</th>
-                <th width="100">产品sku</th>
+                <th width="35">时间</th>
+                <#--<th width="100">产品名称</th>-->
+                <#--<th width="100">产品sku</th>-->
                 <#--<th width="100">仓库名称</th>-->
-                <th width="100">变动数量</th>
-                <th width="100">类型</th>
-                <th width="100">质量类型</th>
-                <th width="100">操作类型</th>
+                <th width="20">变动数量</th>
+                <th width="20">类型</th>
+                <th width="20">质量类型</th>
+                <th width="20">操作类型</th>
                 <th width="100">备注</th>
             </tr>
             </thead>
@@ -88,11 +104,14 @@
             <#if (page.dataList?size > 0)>
                 <#list page.dataList as info>
                 <tr>
-                    <td class="text-c" width="100">${info.logProductName!}</td>
-                    <td class="text-c" width="100">${info.logProductBar!}</td>
+                    <td class="text-c" width="35">
+                        ${(info.logCreateTime?string("yyyy-MM-dd HH:mm:ss"))!''}
+                    </td>
+                    <#--<td class="text-c" width="100">${info.logProductName!}</td>-->
+                    <#--<td class="text-c" width="100">${info.logProductBar!}</td>-->
                     <#--<td class="text-c" width="100">${info.logWarehouseName!}</td>-->
-                    <td class="text-c" width="100">${info.logRemainingNum!}</td>
-                    <td class="text-c" width="100">
+                    <td class="text-c" width="20">${info.logRemainingNum!}</td>
+                    <td class="text-c" width="20">
                         <#if info.logType == 1>
                             采购
                         </#if>
@@ -103,7 +122,7 @@
                             次品
                         </#if>
                     </td>
-                    <td class="text-c" width="100">
+                    <td class="text-c" width="20">
                         <#if info.logOperationType == 1>
                             入库
                         </#if>
@@ -111,7 +130,7 @@
                             出库
                         </#if>
                     </td>
-                    <td class="text-c" width="100">
+                    <td class="text-c" width="20">
                         <#if info.logQualityType??>
                             <#if info.logQualityType == 1>
                                 良品
@@ -121,7 +140,8 @@
                             </#if>
                         </#if>
                     </td>
-                    <td class="text-c" width="100">${info.logDesc!}</td>
+                    <td class="" width="100">${info.logDesc!}</td>
+
                 </tr>
                 </#list>
             <#else >

watero-rst-web/src/main/webapp/WEB-INF/views/cm/inventory/inventory_list.ftl

@@ -123,7 +123,7 @@
                             <i class="Hui-iconfont">出库</i>
                         </a>
                         <a style="text-decoration:none" href="javascript:;" title="出入库记录"
-                           onclick="getInventoryLog('${path}/admin/inventory/select_inventoryLog_list?logProductBar=${info.inventoryProductBar!''}');">
+                           onclick="getInventoryLog('${path}/admin/inventory/select_inventoryLog_list?logProductBar=${info.inventoryProductBar!''}&logWarehouseId=${info.warehouseId!''}');">
                             <i class="Hui-iconfont">出入库记录</i>
                         </a>
                     </td>

watero-rst-web/src/main/webapp/WEB-INF/views/order/salesOrder/list_wait_send_order.ftl

@@ -371,7 +371,7 @@
                 dataType: 'json',
                 type: 'post',
                 success: function(dt) {
-                    if(dt.resultCode == 200){
+                    if(dt.resultCode == 200 && dt.returnCode == 200){
                         layer.msg(dt.resultMsg, {icon: 1, time: 3000});
                     }else{
                         layer.msg(dt.resultMsg, {icon: 5, time: 3000});