sql修改

src/main/java/com/dk/mdm/controller/mst/CustomerController.java

@@ -13,6 +13,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import io.swagger.annotations.Api;
 import com.dk.mdm.service.mst.CustomerService;
 
+import java.util.List;
+
 @Api(tags = "客户资料API接口")
 @RestController
 @RequestMapping("/mst/customer")
@@ -69,4 +71,11 @@ public class CustomerController{
     public ResponseResultVO<?> selectByIdRespone(@PathVariable String id) {
         return customerService.selectByIdRespone(id);
     }
+
+
+    @ApiOperation(value = "不分页", notes = "分页、关联、条件查询")
+    @PostMapping({"select_by_cond_no_page"})
+    public ResponseResultVO<List<CustomerResponse>> selectByCondNoPage(@RequestBody CustomerQuery customerQuery) {
+        return customerService.selectByCondNoPage(customerQuery);
+    }
 }

src/main/java/com/dk/mdm/mapper/ivt/InboundMapper.xml

@@ -549,7 +549,7 @@
         <include refid="Base_Column_List_Item_Response"/>,
         <include refid="Base_Column_List_Item_Response_Join"/>
         FROM dkic_b.t_psi_inbound  tpi
-        left  join dkic_b.t_psi_inbound_item tpii  on tpi.into_id = tpii.into_id
+        left  join dkic_b.t_psi_inbound_item tpii  on tpi.into_id = tpii.into_id and  ( tpii.into_qty - tpii.return_qty) > 0
         left  join  dkic_b.t_mst_warehouse tmw on  tmw.wh_id =   tpii.wh_id
         inner join  dkic_b.t_mst_goods_sku  tmgs on tmgs.sku_id = tpii.sku_id
         left join(SELECT T.*

src/main/java/com/dk/mdm/mapper/ivt/OutboundItemMapper.xml

@@ -409,14 +409,14 @@
         update dkic_b.t_psi_outbound_item
         <set>
             <if test=" returnQty != null">
-                return_qty = return_qty + #{et.returnQty,jdbcType=NUMERIC},
+                return_qty = return_qty + #{returnQty,jdbcType=NUMERIC},
             </if>
             <if test=" returnAmt != null">
-                return_amt = return_amt + #{et.returnAmt,jdbcType=NUMERIC},
+                return_amt = return_amt + #{returnAmt,jdbcType=NUMERIC},
             </if>
         </set>
         where item_id = #{itemId,typeHandler=UuidTypeHandler}
-        and  item_qty >= return_qty
+        and  out_qty >= return_qty
     </update>
 
 </mapper>

src/main/java/com/dk/mdm/mapper/ivt/OutboundMapper.xml

@@ -562,11 +562,11 @@
     <update id="updateReturnMessage" parameterType="com.dk.mdm.model.pojo.sale.OrderItem">
         update dkic_b.t_psi_outbound
         <set>
-            <if test=" returnQty != null">
-                return_qty = return_qty + #{et.returnQty,jdbcType=NUMERIC},
+            <if test="returnQty != null">
+                return_qty = return_qty + #{returnQty,jdbcType=NUMERIC},
             </if>
-            <if test=" returnAmt != null">
-                return_amt = return_amt + #{et.returnAmt,jdbcType=NUMERIC},
+            <if test="returnAmt != null">
+                return_amt = return_amt + #{returnAmt,jdbcType=NUMERIC},
             </if>
         </set>
         where out_id = #{outId,typeHandler=UuidTypeHandler}

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

@@ -417,10 +417,10 @@
         update dkic_b.t_psi_order_item
         <set>
             <if test=" returnQty != null">
-                return_qty = return_qty + #{et.returnQty,jdbcType=NUMERIC},
+                return_qty = return_qty + #{returnQty,jdbcType=NUMERIC},
             </if>
             <if test=" returnAmt != null">
-                return_amt = return_amt + #{et.returnAmt,jdbcType=NUMERIC},
+                return_amt = return_amt + #{returnAmt,jdbcType=NUMERIC},
             </if>
         </set>
         where item_id = #{itemId,typeHandler=UuidTypeHandler}

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

@@ -922,10 +922,10 @@
         update dkic_b.t_psi_order
         <set>
             <if test=" returnQty != null">
-                return_qty = return_qty + #{et.returnQty,jdbcType=NUMERIC},
+                return_qty = return_qty + #{returnQty,jdbcType=NUMERIC},
             </if>
             <if test=" returnAmt != null">
-                return_amt = return_amt + #{et.returnAmt,jdbcType=NUMERIC},
+                return_amt = return_amt + #{returnAmt,jdbcType=NUMERIC},
             </if>
         </set>
         where order_id = #{orderId,typeHandler=UuidTypeHandler}

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

@@ -268,7 +268,7 @@ public class OutboundSaleOrderService extends BaseService<Outbound> {
 
         //region  已出库  账款
         if (Constant.OutStatus.YICHUKU.getName().equals(outboundVO.getOutStatus())) {
-            accountService.accPayable(outboundVO.getOutId(), Constant.InventoryDocCode.OUTBOUND.getTableName());
+            accountService.accReceivable(outboundVO.getOutId(), Constant.InventoryDocCode.OUTBOUND.getTableName());
         }
         //endregion
 

src/main/java/com/dk/mdm/service/mst/CustomerService.java

@@ -145,4 +145,8 @@ public class CustomerService extends BaseService<Customer> {
         return ResponseResultUtil.success(customerResponse);
     }
 
+    public ResponseResultVO<List<CustomerResponse>> selectByCondNoPage(CustomerQuery customerQuery) {
+        List<CustomerResponse> customerResponses = customerMapper.selectByCond(customerQuery);
+        return ResponseResultUtil.success(customerResponses);
+    }
 }