Merge branch 'fencang' into busUser

# Conflicts:
#	api-admin/src/main/java/com/glxp/sale/admin/entity/inout/OrderEntity.java
#	api-admin/src/main/java/com/glxp/sale/admin/entity/inout/StockOrderPrintEntity.java
#	api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml

api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderController.java

@@ -203,6 +203,19 @@ public class OrderController {
         return ResultVOUtils.success("添加成功");
     }
 
+
+    @AuthRuleAnnotation("")
+    @PostMapping("/udiwms/inout/order/updateOrder")
+    public BaseResponse updateOrder(@RequestBody OrderEntity orderEntity,
+                                    BindingResult bindingResult) {
+        orderEntity.setUpdateTime(new Date());
+        boolean b = orderService.updateOrder(orderEntity);
+        if (!b) {
+            return ResultVOUtils.error(ResultEnum.NOT_NETWORK);
+        }
+        return ResultVOUtils.success("更新成功");
+    }
+
     @AuthRuleAnnotation("")
     @GetMapping("/udiwms/inout/order/filter")
     public BaseResponse filterOrder(OrderFilterRequest orderFilterRequest,
@@ -525,6 +538,23 @@ public class OrderController {
         return ResultVOUtils.success(pageSimpleResponse);
     }
 
+
+    @AuthRuleAnnotation("")
+    @GetMapping("/udiwms/inout/order/findOrderByStockOrder")
+    public BaseResponse findByStockOrder(OrderFilterRequest orderFilterRequest,
+                                         BindingResult bindingResult) {
+
+
+        String stockBillNo = orderFilterRequest.getStockOrderId();
+        if (StrUtil.isEmpty(stockBillNo)) {
+
+            return ResultVOUtils.error(500, "业务单据ID不能为空！");
+        }
+        StockOrderEntity stockOrderEntity = stockOrderService.findByBillNo(stockBillNo);
+        OrderEntity orderEntity = orderService.findById(stockOrderEntity.getOrderIdFk());
+        return ResultVOUtils.success(orderEntity);
+    }
+
     //更新订单
     @AuthRuleAnnotation("")
     @PostMapping("/udiwms/inout/order/updateExportStatus")

api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockOrderController.java

@@ -601,6 +601,8 @@ public class StockOrderController {
     }
 
 
+
+
     public String getCustomerId() {
         ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
         if (attributes == null) {

api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockQRCodeTextController.java

@@ -1,6 +1,7 @@
 package com.glxp.sale.admin.controller.inout;
 
 import cn.hutool.core.util.StrUtil;
+import cn.hutool.db.sql.Order;
 import com.github.pagehelper.PageInfo;
 import com.glxp.sale.admin.annotation.AuthRuleAnnotation;
 import com.glxp.sale.admin.entity.basic.BussinessLocalTypeEntity;
@@ -29,6 +30,7 @@ import com.glxp.sale.admin.service.basic.BussinessLocalTypeService;
 import com.glxp.sale.admin.service.basic.BussinessTypeService;
 import com.glxp.sale.admin.service.basic.UdiRelevanceService;
 import com.glxp.sale.admin.service.info.CompanyService;
+import com.glxp.sale.admin.service.inout.OrderService;
 import com.glxp.sale.admin.service.inout.StockOrderDetailService;
 import com.glxp.sale.admin.service.inout.StockOrderService;
 import com.glxp.sale.admin.service.inout.StockQRCodeTextService;
@@ -65,6 +67,8 @@ public class StockQRCodeTextController {
     @Resource
     StockOrderService stockOrderService;
     @Resource
+    OrderService orderService;
+    @Resource
     StockOrderDetailService stockOrderDetailService;
     @Resource
     StockQRCodeTextService stockQRCodeTextService;
@@ -376,6 +380,8 @@ public class StockQRCodeTextController {
         systemPDFTemplateRelevanceRequest.setLocalAction(stockOrderEntity.getBillType());
         BussinessLocalTypeEntity bussinessLocalTypeEntity = bussinessLocalTypeService.findBTByAction(stockOrderEntity.getBillType());
 
+        OrderEntity orderEntity = orderService.findById(stockOrderEntity.getOrderIdFk());
+
         List<SystemPDFTemplateRelevanceResponse> systemPDFTemplateRelevanceResponses = systemPDFTemplateRelevanceService.filterList(systemPDFTemplateRelevanceRequest);
         if (systemPDFTemplateRelevanceResponses == null || systemPDFTemplateRelevanceResponses.size() < 1) return;
         SystemPDFTemplateRelevanceResponse systemPDFTemplateRelevanceResponse = systemPDFTemplateRelevanceResponses.get(0);
@@ -403,6 +409,7 @@ public class StockQRCodeTextController {
                     stockOrderPrintEntity.setRemark1(systemPDFModuleEntity.getRemark1());
                     stockOrderPrintEntity.setRemark2(systemPDFModuleEntity.getRemark2());
                     stockOrderPrintEntity.setRemark3(systemPDFModuleEntity.getRemark3());
+                    stockOrderPrintEntity.setBillRemark(orderEntity.getPrintRemark());
                     index++;
                 }
 
@@ -442,6 +449,7 @@ public class StockQRCodeTextController {
                     stockOrderPrintEntity.setRemark1(systemPDFModuleEntity.getRemark1());
                     stockOrderPrintEntity.setRemark2(systemPDFModuleEntity.getRemark2());
                     stockOrderPrintEntity.setRemark3(systemPDFModuleEntity.getRemark3());
+                    stockOrderPrintEntity.setBillRemark(orderEntity.getPrintRemark());
                     StockOrderDetailEntity stockOrderDetailEntity = getDetailByRelBatch(stockOrderDetailEntities, stockOrderPrintEntity.getProductId(), stockOrderPrintEntity.getBatchNo());
                     if (stockOrderDetailEntity != null) {
                         stockOrderPrintEntity.setPrice(stockOrderDetailEntity.getPrice());

api-admin/src/main/java/com/glxp/sale/admin/entity/inout/OrderEntity.java

@@ -66,5 +66,6 @@ public class OrderEntity {
     private String invName;
     private String deptCode;
     private String deptName;
+    private String printRemark;
 
 }

api-admin/src/main/java/com/glxp/sale/admin/entity/inout/StockOrderPrintEntity.java

@@ -52,6 +52,6 @@ public class StockOrderPrintEntity extends StockOrderDetailEntity {
     private String serialNo;        //序列号
     private String nameCode;
     private String deptName;
-
     private String orderRemark;
+    private String billRemark;
 }

api-admin/src/main/java/com/glxp/sale/admin/req/inout/OrderFilterRequest.java

@@ -39,4 +39,7 @@ public class OrderFilterRequest extends ListPageRequest {
     private List<String> filterActions;
     private String wmsUserId;
     private String wmsUserName;
+
+
+    private String stockOrderId;
 }

api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/OrderServiceImpl.java

@@ -201,6 +201,9 @@ public class OrderServiceImpl implements OrderService {
     public OrderEntity findById(String orderId) {
         OrderFilterRequest orderFilterRequest = new OrderFilterRequest();
         orderFilterRequest.setId(orderId);
+        if (StrUtil.isEmpty(orderId)) {
+            return null;
+        }
         return orderDao.findOne(orderFilterRequest);
     }
 

api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml

@@ -34,7 +34,7 @@
                              receiveStatus, erpFk, stockCheckFk, customerId, supId,
                              exportFilePath, locStorageCode, supplementNo, ullageSupNo, createUser, reviewUser,
                              outChangeEnable, originUllageSupNo, preCheck, updateTime, replicateNo, invWarehouseCode,
-                             fromSubInvCode, createTime,invStorageCode,deptCode)
+                             fromSubInvCode, createTime,invStorageCode,deptCode,printRemark)
         values (#{id},
                 #{action},
                 #{corpOrderId},
@@ -55,6 +55,7 @@
                 #{customerId}, #{supId}, #{exportFilePath}, #{locStorageCode}, #{supplementNo},
                 #{ullageSupNo}, #{createUser}, #{reviewUser}, #{outChangeEnable}, #{originUllageSupNo}, #{preCheck},
                 #{updateTime}, #{replicateNo}, #{invWarehouseCode}, #{fromSubInvCode}, #{createTime},#{invStorageCode}, #{deptCode})
+                #{printRemark})
     </insert>
 
 
@@ -65,7 +66,7 @@
                               fromCorp, status, remark, exportStatus, fromType, contrastStatus, signStatus,
                               receiveStatus, erpFk, stockCheckFk, customerId, supId,
                               exportFilePath, locStorageCode, supplementNo, ullageSupNo, createUser, reviewUser,
-                              outChangeEnable, originUllageSupNo, preCheck,updateTime,replicateNo,invWarehouseCode,fromSubInvCode,createTime,invStorageCode,deptCode)
+                              outChangeEnable, originUllageSupNo, preCheck,updateTime,replicateNo,invWarehouseCode,fromSubInvCode,createTime,invStorageCode,deptCode,printRemark)
         values (
         #{id},
         #{action},
@@ -100,7 +101,7 @@
         #{invWarehouseCode},
         #{fromSubInvCode},
         #{createTime},#{invStorageCode},
-        #{deptCode}
+        #{deptCode}, #{printRemark}
         )
     </insert>
 
@@ -142,6 +143,7 @@
             <if test="fromSubInvCode != null and fromSubInvCode != ''">fromSubInvCode=#{fromSubInvCode},</if>
             <if test="createTime != null and createTime != ''">createTime=#{createTime},</if>
             <if test="deptCode != null and deptCode != ''">deptCode=#{deptCode},</if>
+            <if test="printRemark != null and printRemark != ''">printRemark=#{printRemark},</if>
 
         </trim>
         WHERE id = #{id}