Merge branch 'master' of http://121.40.253.172:3000/pengyue/jsh_erp into master_huangjunjie

jshERP-web/src/views/material/MaterialList.vue

@@ -367,8 +367,8 @@ export default {
           },
         },
         { title: '基础重量', dataIndex: 'weight', width: 80 },
-        { title: '保质期', dataIndex: 'expiryNum', width: 60 },
-        { title: '制造商', dataIndex: 'mfrs', width: 120, ellipsis: true },
+        // { title: '保质期', dataIndex: 'expiryNum', width: 60 },
+        // { title: '制造商', dataIndex: 'mfrs', width: 120, ellipsis: true },
         {
           title: '初始库存',
           dataIndex: 'initialStock',
@@ -380,7 +380,7 @@ export default {
         { title: '零售价', dataIndex: 'commodityDecimal', width: 80 },
         { title: '销售价', dataIndex: 'wholesaleDecimal', width: 80 },
         { title: '最低售价', dataIndex: 'lowDecimal', width: 80 },
-        { title: '仓位货架', dataIndex: 'position', width: 80 },
+        // { title: '仓位货架', dataIndex: 'position', width: 80 },
         { title: '备注', dataIndex: 'remark', width: 80 },
         {
           title: '状态',

src/main/java/com/jsh/erp/controller/pda/PdaController.java

@@ -107,8 +107,15 @@ public class PdaController extends BaseController {
     @GetMapping("/orderInfo/{id}")
     public AjaxResult orderInfo(@PathVariable("id") Long id){
         DepotHead depotHead = depotHeadService.getOne(new LambdaQueryWrapperX<DepotHead>().eq(DepotHead::getId, id));
-        depotHead.setSupplierName(supplierService.getOne(new LambdaQueryWrapperX<Supplier>().eq(Supplier::getId, depotHead.getOrganId())).getSupplier());
-//        depotHeadService.pdaDetail(id);
+        if (depotHead.getOrganId() != null) {
+            depotHead.setSupplierName(supplierService.getOne(new LambdaQueryWrapperX<Supplier>().eq(Supplier::getId, depotHead.getOrganId())).getSupplier());
+        }
+        if (depotHead.getCreator() != null) {
+            depotHead.setCreateName(userService.getOne(new LambdaQueryWrapperX<User>().eq(User::getId, depotHead.getCreator())).getUsername());
+        }
+        if (depotHead.getOperId() != null) {
+            depotHead.setOperName(userService.getOne(new LambdaQueryWrapperX<User>().eq(User::getId, depotHead.getOperId())).getUsername());
+        }
         return AjaxResult.success(depotHead);
     }
 

src/main/java/com/jsh/erp/datasource/entities/DepotHead.java

@@ -127,6 +127,14 @@ public class DepotHead {
     @ApiModelProperty("供应商名称")
     private String supplierName;
 
+    @TableField(exist = false)
+    @ApiModelProperty("供应商名称")
+    private String operName;
+
+    @TableField(exist = false)
+    @ApiModelProperty("供应商名称")
+    private String createName;
+
     @ApiModelProperty("集采订单编号")
     private String linkTesco;
 

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

@@ -25,4 +25,7 @@ public class PDATaskStocktakingItemDTO {
 
     @ApiModelProperty("任务编号")
     private String number;
+
+    @ApiModelProperty("库位")
+    private String position;
 }

src/main/java/com/jsh/erp/datasource/pda/vo/PDADepotItemVO.java

@@ -66,6 +66,7 @@ public class PDADepotItemVO{
     private String imgName;
 
     @ApiModelProperty("出入库时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date warehousingTime;
 
 

src/main/resources/mapper_xml/DepotItemMapper.xml

@@ -627,7 +627,7 @@
       d.name AS depot_name,
       m.standard AS material_standard,
       di.actual_quantity_in_storage AS actual_quantity_in_storage,
-      di.warehousing_time AS warehousing_time,
+      dh.create_time AS warehousing_time,
       me.commodity_unit AS commodity_unit,
       m.img_name AS img_name
     FROM
@@ -638,6 +638,7 @@
       LEFT JOIN jsh_depot d ON di.depot_id = d.id
     WHERE
       di.delete_flag = '0'
+      AND dh.delete_flag = '0'
       AND dh.status in ('2','3')
       AND dh.type = #{type}
       AND di.material_id = #{materialId}

src/main/resources/mapper_xml/DepotMapper.xml

@@ -339,7 +339,7 @@
   <select id="depotSpinnerList" resultType="com.jsh.erp.datasource.vo.SpinnerVO">
     SELECT
       id AS value,
-      bane AS label
+      name AS label
     FROM
       jsh_depot
     WHERE