Merge branch 'master' of http://git.dongkesoft.com:9001/iBOSS-2.0-Mini/iboss-server-mdm

src/main/java/com/dk/mdm/mapper/sale/OrderMapper.xml

@@ -558,6 +558,13 @@
                  left join sys.t_data_kind as tdk2 on t.order_status = tdk2.kind_code
                  left join sys.t_data_kind as tdk3 on t.out_status = tdk3.kind_code
         <include refid="Condition"/>
+        <if test="searchText !=null">
+            AND (  t.order_no LIKE concat('%', my_ex.likequery(#{searchText}), '%')
+            OR   t.cus_name LIKE concat('%', my_ex.likequery(#{searchText}), '%')
+            OR   t.cus_phone LIKE concat('%', my_ex.likequery(#{searchText}), '%')
+            OR   t.address_full LIKE concat('%', my_ex.likequery(#{searchText}), '%')
+            )
+        </if>
         order by t.op_create_time desc
         <if test="pageSize != null and currentPage != null and pageSize != 0 and currentPage != 0">
             limit #{end} offset #{start}
@@ -571,6 +578,13 @@
         FROM dkic_b.t_psi_order as t
                 left join dkic_b.t_mst_customer tmc on t.cus_id = tmc.cus_id
         <include refid="Condition"/>
+        <if test="searchText !=null">
+        AND (  t.order_no LIKE concat('%', my_ex.likequery(#{searchText}), '%')
+        OR   t.cus_name LIKE concat('%', my_ex.likequery(#{searchText}), '%')
+        OR   t.cus_phone LIKE concat('%', my_ex.likequery(#{searchText}), '%')
+        OR   t.address_full LIKE concat('%', my_ex.likequery(#{searchText}), '%')
+        )
+        </if>
     </select>
 
     <sql id="Base_Column_List_Item_Response_Join">

src/main/java/com/dk/mdm/model/vo/sale/OrderItemVO.java

@@ -323,6 +323,13 @@ public class OrderItemVO extends PageInfo<OrderItemVO> implements Serializable {
     @ApiModelProperty(value = "成本金额")
     private BigDecimal costAmt;
 
+    @ApiModelProperty(value = "原仓库ID")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String whIdPri;
+
+    @ApiModelProperty(value = "原非标号")
+    private String nonStdCodePri;
+
     private static final long serialVersionUID = 1L;
 
 }

src/main/java/com/dk/mdm/service/ivt/inventory/InventoryService.java

@@ -1306,6 +1306,7 @@ public class InventoryService extends BaseService<Inventory> {
                         InventoryBatchResponse inventoryBatchResponse = inventoryBatchMapper.selectById(outboundItemCostResponse.getBatchId());
                         InventoryBatch inventoryBatch = new InventoryBatch();
                         inventoryBatch.setBatchId(outboundItemCostResponse.getBatchId());
+                        //库存批次现在数据库的数量 +  上次出库成本写入的数量
                         inventoryBatch.setInvQty(inventoryBatchResponse.getInvQty().add(outboundItemCostResponse.getOutQty()));
                         inventoryBatch.setCostAmt(inventoryBatch.getInvQty().multiply(outboundItemCostResponse.getCostPrice()));
                         inventoryBatchMapper.updateAmtAndQty(inventoryBatch);

src/main/java/com/dk/mdm/service/ivt/outbound/OutboundSaleOrderService.java

@@ -753,6 +753,10 @@ public class OutboundSaleOrderService extends BaseService<Outbound> {
                         outboundItem.setOutAmt(outboundItemVO.getOutingAmt());
                         outboundItem.setFactAmt(outboundItemVO.getFactAmt());
                         outboundItem.setFactPrice(outboundItemVO.getFactPrice());
+                        outboundItem.setCostPrice(outboundItemVO.getCostPrice() != null ?outboundItemVO.getCostPrice() : null);
+                        outboundItem.setCostAmt(outboundItemVO.getCostAmt() != null ? outboundItemVO.getCostAmt() :null );
+                        outboundItem.setWhId(outboundItemVO.getWhId());
+                        outboundItem.setNonStdCode(outboundItemVO.getNonStdCode());
                         //修改
                         outboundItemMapper.update(outboundItem,
                                 new UpdateWrapper<OutboundItem>().lambda()