在日志里面增加单据类型

pang.jiabao

2024-06-14 bbc8c5df2618d2a9032d272a1fae68cdea780664

在日志里面增加单据类型

 src/main/java/com/zy/asrs/controller/MobileController.java

@@ -600,7 +600,7 @@

            plaService.updateById(pla);
            SaasUtils.insertLog(2,sourceLocNo,pla.getBrand(),pla.getWeightAnfme(),getUser().getUsername(),
                    locNo,pla.getBatch(),pla.getPackageNo(),pla.getOwner(),pla.getWorkshop());
                    locNo,pla.getBatch(),pla.getPackageNo(),pla.getOwner(),pla.getWorkshop(),null);

        });


 src/main/java/com/zy/asrs/controller/PlaController.java

@@ -229,7 +229,7 @@
            pla.setWeightAnfme(0.0);
            plaService.updateById(pla);
            SaasUtils.insertLog(1,pla.getLocNo(),pla.getBrand(),anfme,getUser().getUsername(),
                    null,pla.getBatch(),pla.getPackageNo(),pla.getOwner(),pla.getWorkshop());
                    null,pla.getBatch(),pla.getPackageNo(),pla.getOwner(),pla.getWorkshop(),null);
        });

        return R.ok();

 src/main/java/com/zy/asrs/service/impl/ManLocDetlServiceImpl.java

@@ -164,7 +164,7 @@
            manLocDetl.setUpdateBy(userId);
            manLocDetl.setModiTime(now);
            SaasUtils.insertLog(3,manLocDetl.getLocNo(), manLocDetl.getMatnr(),manLocDetl.getAnfme(),user.getUsername(),
                    null,null,null,null, null);
                    null,null,null,null, null,null);
            this.baseMapper.insert(manLocDetl);
        }
    }

 src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java

@@ -666,7 +666,7 @@
            orderService.checkComplete(order.getOrderNo());

            SaasUtils.insertLog(0,jsonLocNo,jsonOrderDetl.getMatnr(), jsonOrderDetl.getAnfme(),user.getUsername(),
        null,null,null,null,null);
        null,null,null,null,null,null);
        }


@@ -808,7 +808,7 @@
                }
            }
            SaasUtils.insertLog(1,jsonLocNo,jsonOrderDetl.getMatnr(), jsonOrderDetl.getAnfme(),user.getUsername(),
                    null,null,null,null,null);
                    null,null,null,null,null,null);

        }
        return R.ok("下架完成");
@@ -1233,7 +1233,7 @@

        plaService.updateById(pla);
        SaasUtils.insertLog(0,locNo,pla.getBrand(),pla.getWeightAnfme(),user.getUsername(),
                null,pla.getBatch(),pla.getPackageNo(),pla.getOwner(),pla.getWorkshop());
                null,pla.getBatch(),pla.getPackageNo(),pla.getOwner(),pla.getWorkshop(),null);
    }

    @Override
@@ -1287,7 +1287,7 @@
        }
        plaService.updateById(pla);
        SaasUtils.insertLog(1,locNo,pla.getBrand(),anfme,null,null,
                pla.getBatch(),pla.getPackageNo(),pla.getOwner(),pla.getWorkshop());
                pla.getBatch(),pla.getPackageNo(),pla.getOwner(),pla.getWorkshop(),null);

        //更新订单明细
        Order order = orderService.selectByNo(orderNo);
@@ -1323,7 +1323,7 @@

        plaService.updateById(pla);

        SaasUtils.insertLog(1,pla.getLocNo(),pla.getBrand(),anfme,null,null,pla.getBatch(),pla.getPackageNo(),pla.getOwner(),pla.getWorkshop());
        SaasUtils.insertLog(1,pla.getLocNo(),pla.getBrand(),anfme,null,null,pla.getBatch(),pla.getPackageNo(),pla.getOwner(),pla.getWorkshop(),null);

    }


 src/main/java/com/zy/asrs/service/impl/NodeServiceImpl.java

@@ -124,7 +124,7 @@
                manLocDetl.setStatus(1);
                manLocDetl.setPayment(1);
                SaasUtils.insertLog(0,manLocDetl.getLocNo(),manLocDetl.getMatnr(), manLocDetl.getAnfme(),user.getUsername(),
                        null,null,null,null,null);
                        null,null,null,null,null,null);
                manLocDetlService.insert(manLocDetl);
            }else {
//                check.setAnfme(dto.getCount() + check.getAnfme());
@@ -166,7 +166,7 @@
                    return R.error("物料:"+ param.getMatnr() + " 在库位中数量不足");
                } else if (manLocDetl.getAnfme() - param.getCount() == 0) {
                    SaasUtils.insertLog(1,manLocDetl.getLocNo(), manLocDetl.getMatnr(),param.getCount(),user.getUsername(),
                            null,null,null,null,null);
                            null,null,null,null,null,null);
                    manLocDetlService.delete(new EntityWrapper<ManLocDetl>()
                            .eq("loc_no",node.getUuid())
                            .eq("matnr",param.getMatnr()));
@@ -177,7 +177,7 @@
                            .eq("loc_no",node.getUuid())
                            .eq("matnr",param.getMatnr()));
                    SaasUtils.insertLog(1,manLocDetl.getLocNo(), manLocDetl.getMatnr(),param.getCount(),user.getUsername(),
                            null,null,null,null,null);
                            null,null,null,null,null,null);
                }
            }
        }
@@ -208,7 +208,7 @@
                source.setNodeId(targetNode.getId());

                SaasUtils.insertLog(2,source.getLocNo(), source.getMatnr(), source.getAnfme(),user.getUsername(),
                        null,null,null,null,null);
                        null,null,null,null,null,null);
                manLocDetlService.insert(source);
            }else {
//                check.setAnfme(check.getAnfme() + source.getAnfme());

 src/main/java/com/zy/asrs/service/impl/PlaServiceImpl.java

@@ -130,7 +130,7 @@
            this.updateById(pla);

            SaasUtils.insertLog(0,pla.getLocNo(),pla.getBrand(),plaQty.getOrderWeight(),user.getUsername(),
                    null,pla.getBatch(),pla.getPackageNo(),pla.getOwner(),pla.getWorkshop());
                    null,pla.getBatch(),pla.getPackageNo(),pla.getOwner(),pla.getWorkshop(),null);

        });
    }

 src/main/java/com/zy/asrs/utils/SaasUtils.java

@@ -19,9 +19,10 @@
     * @param packageNo
     * @param owner 主体
     * @param workshop 车间
     * @param docType 单据类型
     */
    public static void insertLog(Integer type, String locNo, String matnr,Double anfme,
                                 String user,String targetLocNo,String batch,Integer packageNo,String owner,String workshop){
                                 String user,String targetLocNo,String batch,Integer packageNo,String owner,String workshop, Long docType){
        SaasLogService bean = SpringUtils.getBean(SaasLogService.class);
        SaasLog saasLog = new SaasLog();
        saasLog.setType(type);
@@ -36,6 +37,7 @@
        saasLog.setCreateByName(user);
        saasLog.setOwner(owner);
        saasLog.setWorkshop(workshop);
        saasLog.setDocType(docType);
        bean.insert(saasLog);
    }
}

 src/main/java/com/zy/system/entity/SaasLog.java

@@ -71,6 +71,12 @@
     */
    private String workshop;

    /**
     * 单据类型
     */
    @TableField("doc_type")
    private Long docType;

    public SaasLog() {}

    public SaasLog(Long id,Integer type,String locNo,String matnr,Date ioTime,Long createBy) {
@@ -99,6 +105,9 @@
    }

    public String getType$(){
        if (this.type == null) {
            return "";
        }
        if (this.type ==0) {
            return "入库";
           } else if (this.type == 1) {
@@ -112,6 +121,9 @@
        }

    }
    public String getDocType$(){
        return "";
    }


}

 src/main/webapp/static/js/saasLog/saasLog.js

@@ -40,6 +40,7 @@
            ,{field: 'owner', align: 'center',title: '主体'}
            ,{field: 'workshop', align: 'center',title: '车间'}
            ,{field: 'anfme', align: 'center',title: '数量',totalRow:true}
            ,{field: 'docType$', align: 'center',title: '单据类型',totalRow:true}
            // ,{field: 'createByName', align: 'center',title: '操作人'}
            ,{field: 'ioTime$', align: 'center',title: '操作时间'}
            ,{field: 'createBy', align: 'center',title: '', hide:true}