商品提醒bug修改

src/main/java/com/jsh/erp/controller/MaterialController.java

@@ -931,7 +931,7 @@ public class MaterialController extends BaseController {
     /**
      * 商品信息全选获取批次号
      */
-    @GetMapping(value = "/findBatchNumberSBySelect")
+    @GetMapping(value = "/findBatchNumbersBySelect")
     @ApiOperation(value = "商品选择全选获取商品批次号")
     public BaseResponseInfo findBatchNumberSBySelect(@RequestParam(value = "categoryId", required = false) Long categoryId,
                                            @RequestParam(value = "q", required = false) String q,

src/main/java/com/jsh/erp/datasource/mappers/DepotItemMapperEx.java

@@ -249,7 +249,7 @@ public interface DepotItemMapperEx {
             @Param("batchNumber") String batchNumber);
 
     List<MaterialVo4Unit> getBillItemByParam(
-            @Param("barCodes") String barCodes);
+            @Param("batchNumbers") String batchNumbers);
 
     BigDecimal getCurrentStockByParam(
             @Param("depotId") Long depotId,

src/main/java/com/jsh/erp/datasource/pda/dto/PDADepotHeadDTO.java

@@ -1,8 +1,12 @@
 package com.jsh.erp.datasource.pda.dto;
 
+import com.jsh.erp.datasource.pda.vo.PDADepotItemVO;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
+import java.util.List;
+
 @Data
 public class PDADepotHeadDTO {
 
@@ -20,4 +24,13 @@ public class PDADepotHeadDTO {
 
     @ApiModelProperty("单据类型")
     private String subType;
+
+    @ApiModelProperty("操作类型")
+    private String type;
+
+    @ApiModelProperty("订单商品数据")
+    private List<PDADepotMaterialDto> material;
+
+
+
 }

src/main/java/com/jsh/erp/datasource/pda/dto/PDADepotMaterialDto.java

@@ -0,0 +1,17 @@
+package com.jsh.erp.datasource.pda.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class PDADepotMaterialDto {
+
+    @ApiModelProperty("批次号")
+    private String batchNumber;
+
+    @ApiModelProperty("订单数量")
+    private BigDecimal operNumber;
+
+}

src/main/java/com/jsh/erp/service/DepotHeadService.java

@@ -189,4 +189,5 @@ public interface DepotHeadService extends IService<DepotHead> {
      * @return
      */
     DepotHead getDepotLastByMaterialId(long mid);
+
 }

src/main/java/com/jsh/erp/service/DepotItemService.java

@@ -170,11 +170,11 @@ public interface DepotItemService extends IService<DepotItem> {
 
     /**
      * 解析excel表格数据
-     * @param batchNumber 批次号
+     * @param batchNumbers 批次号
      * @param detailList    数据明细
      * @param prefixNo  单据类型
      */
-    JSONObject parseMapByExcelData(String batchNumber, List<Map<String, String>> detailList, String prefixNo) throws Exception;
+    JSONObject parseMapByExcelData(String batchNumbers, List<Map<String, String>> detailList, String prefixNo) throws Exception;
 
     BigDecimal getLastUnitPriceByParam(Long organId, Long meId, String prefixNo);
 

src/main/java/com/jsh/erp/service/impl/DepotItemServiceImpl.java

@@ -1449,11 +1449,11 @@ public class DepotItemServiceImpl extends ServiceImpl<DepotItemMapper, DepotItem
 
 
     @Override
-    public JSONObject parseMapByExcelData(String batchNumber, List<Map<String, String>> detailList, String prefixNo) throws Exception {
+    public JSONObject parseMapByExcelData(String batchNumbers, List<Map<String, String>> detailList, String prefixNo) throws Exception {
         JSONObject map = new JSONObject();
         JSONArray arr = new JSONArray();
         //根据批次号获取商品数据
-        List<MaterialVo4Unit> list = depotItemMapperEx.getBillItemByParam(batchNumber);
+        List<MaterialVo4Unit> list = depotItemMapperEx.getBillItemByParam(batchNumbers);
         //商品数据集合
         Map<String, MaterialVo4Unit> materialMap = new HashMap<>();
         //仓库集合

src/main/resources/mapper_xml/DepotItemMapperEx.xml

@@ -1102,13 +1102,17 @@
     </select>
 
     <select id="getBillItemByParam" resultType="com.jsh.erp.datasource.entities.MaterialVo4Unit">
-        select m.id, m.name, m.standard, m.model, me.id meId,me.commodity_unit commodityUnit,
-        me.purchase_decimal purchaseDecimal, me.wholesale_decimal wholesaleDecimal, me.bar_code mBarCode, me.sku
+        select m.*,u.name unit_name, me.id meId, me.commodity_unit, me.purchase_decimal, me.commodity_decimal,
+        me.wholesale_decimal, me.low_decimal, me.sku,
+        me.production_date, me.expiry_num, me.supplier_id, me.bar_code, me.batch_number, me.depot_id, me.position,d.`name` depotName,s.supplier supplierName
         from jsh_material m
         left join jsh_material_extend me on m.id=me.material_id and ifnull(me.delete_Flag,'0') !='1'
+        left join jsh_unit u on m.unit_id=u.id and ifnull(u.delete_Flag,'0') !='1'
+        left JOIN jsh_depot d on me.depot_id = d.id and ifnull(d.delete_Flag,'0') !='1'
+        left JOIN jsh_supplier s on me.supplier_id = s.id and ifnull(s.delete_Flag,'0') !='1'
         where 1=1
-        <if test="barCodes != null">
-            and me.batch_number in (${barCodes})
+        <if test="batchNumbers != null">
+            and me.batch_number in (${batchNumbers})
         </if>
         and ifnull(m.delete_flag,'0') !='1'
         order by m.id desc