rev:修改组盘记录页面

mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/controller/vehicle/MdPbBucketrecordController.java

@@ -10,6 +10,7 @@ import org.nl.common.utils.RedissonUtils;
 import org.nl.wms.masterdata_manage.service.vehicle.IMdPbBucketrecordService;
 import org.nl.wms.masterdata_manage.service.vehicle.dao.MdPbBucketrecord;
 import org.nl.wms.scheduler_manage.service.point.ISchBasePointService;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -18,7 +19,9 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -39,11 +42,35 @@ public class MdPbBucketrecordController {
     @GetMapping
     @Log("查询桶记录表")
     //("查询桶记录表")
-    public ResponseEntity<Object> query(@RequestParam Map whereJson, PageQuery page) {
-        return new ResponseEntity<>(iMdPbBucketrecordService.queryAll(whereJson,page), HttpStatus.OK);
+    public ResponseEntity<Object> queryBygroup(@RequestParam Map whereJson, PageQuery page) {
+        return new ResponseEntity<>(iMdPbBucketrecordService.queryBygroup(whereJson,page), HttpStatus.OK);
     }
 
-    @PutMapping
+    @GetMapping("/vechile_code")
+    @Log("查询桶表详情")
+    //("查询桶记录表")
+    public ResponseEntity<Object> query(@RequestParam Map whereJson, PageQuery page) {
+        return new ResponseEntity<>(iMdPbBucketrecordService.queryItem(whereJson,page), HttpStatus.OK);
+    }
+
+    @PutMapping("/updategroup")
+    @Log("修改桶记录表")
+    //("查询桶记录表")
+    public ResponseEntity<Object> updategroup(@RequestBody JSONObject whereJson) {
+        String[] bucket_record_ids = whereJson.getString("bucket_record_id").split(",");
+        MdPbBucketrecord param = whereJson.toJavaObject(MdPbBucketrecord.class);
+        List<MdPbBucketrecord> list = new ArrayList<>();
+        for (String bucket_record_id : bucket_record_ids) {
+            MdPbBucketrecord item = new MdPbBucketrecord();
+            BeanUtils.copyProperties(param,item);
+            item.setBucket_record_id(bucket_record_id);
+            list.add(item);
+        }
+        iMdPbBucketrecordService.updateBatchById(list);
+        return new ResponseEntity<>(HttpStatus.OK);
+    }
+
+    @PutMapping()
     @Log("修改桶记录表")
     //("查询桶记录表")
     public ResponseEntity<Object> update(@RequestBody JSONObject whereJson) {
@@ -54,7 +81,14 @@ public class MdPbBucketrecordController {
     @DeleteMapping
     @Log("删除桶记录表")
     public ResponseEntity<Object> delete(@RequestBody String[] ids) {
-        iMdPbBucketrecordService.removeByIds(Arrays.asList(ids));
+        if (ids != null && ids.length >0){
+            List<String> list = new ArrayList();
+            for (String item : ids) {
+                String[] split = item.split(",");
+                list.addAll(Arrays.asList(split));
+            }
+            iMdPbBucketrecordService.removeByIds(list);
+        }
         return new ResponseEntity<>(HttpStatus.OK);
     }
 

mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/IMdPbBucketrecordService.java

@@ -29,6 +29,10 @@ public interface IMdPbBucketrecordService extends IService<MdPbBucketrecord> {
      */
     Object queryAll(Map whereJson, PageQuery page);
 
+    Object queryBygroup(Map whereJson, PageQuery page);
+
+    Object queryItem(Map whereJson,PageQuery page);
+
     void createBucke(MdPbBucketrecord dao);
 
     /**

mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/dao/mapper/MdPbBucketrecordMapper.java

@@ -19,5 +19,7 @@ public interface MdPbBucketrecordMapper extends BaseMapper<MdPbBucketrecord> {
 
     List<Map> queryAll(Map<String,Object> map);
 
+    List<Map> queryAllBygroup(Map<String,Object> map);
+
     List<Map> getMstList(@Param("storagevehicle_code") String storagevehicle_code,@Param("sale_code") String sale_code);
 }

mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/dao/mapper/xml/MdPbBucketrecordMapper.xml

@@ -46,4 +46,37 @@
         </if>
         GROUP BY storagevehicle_code,sale_code,create_time
     </select>
+    <select id="queryAllBygroup" resultType="java.util.Map">
+        SELECT
+        GROUP_CONCAT(bucket_record_id) bucket_record_id,
+               storagevehicle_code,
+                  count(1) as item_count,
+                  sum(re.storage_qty) storage_qtys,qty_unit_name,status,re.create_time,contract_code,sale_code,
+                  GROUP_CONCAT(ma.material_spec) as material_specs
+        FROM
+            MD_PB_BucketRecord re
+                LEFT JOIN md_me_materialbase ma ON ma.material_id = re.material_id
+        WHERE
+        1=1
+        <if test="material_id != null and material_id != ''">
+            and ma.material_id = #{material_id}
+        </if>
+        <if test="sale_code != null and sale_code != ''">
+            and re.sale_code like '%${sale_code}%'
+        </if>
+        <if test="storagevehicle_type != null and storagevehicle_type != ''">
+            and re.storagevehicle_type = #{storagevehicle_type}
+        </if>
+        <if test="status != null and status != ''">
+            and re.status = #{status}
+        </if>
+        <if test="storagevehicle_code != null and storagevehicle_code != ''">
+            and re.storagevehicle_code like '%${storagevehicle_code}%'
+        </if>
+        <if test="bucketunique != null and bucketunique != ''">
+            and ( re.bucketunique like '%${bucketunique}%' )
+        </if>
+        GROUP BY storagevehicle_code,re.status
+        order by re.create_time DESC
+    </select>
 </mapper>

mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/impl/MdPbBucketrecordServiceImpl.java

@@ -81,6 +81,22 @@ public class MdPbBucketrecordServiceImpl extends ServiceImpl<MdPbBucketrecordMap
         return build;
     }
 
+    @Override
+    public Object queryBygroup(Map whereJson, PageQuery pageQuery) {
+        Page<Object> page = PageHelper.startPage(pageQuery.getPage()+1, pageQuery.getSize());
+        TableDataInfo build = TableDataInfo.build(baseMapper.queryAllBygroup(whereJson));
+        build.setTotalElements(page.getTotal());
+        return build;
+    }
+
+    @Override
+    public Object queryItem(Map whereJson,PageQuery pageQuery) {
+        Page<Object> page = PageHelper.startPage(pageQuery.getPage()+1, pageQuery.getSize());
+        TableDataInfo build = TableDataInfo.build(baseMapper.queryAll(whereJson));
+        build.setTotalElements(page.getTotal());
+        return build;
+    }
+
     @Override
     public void createBucke(MdPbBucketrecord dao) {
         MdPbStoragevehicleinfo vehicleDao = iMdPbStoragevehicleinfoService.getOne(