Merge remote-tracking branch 'origin/master'

jnpf-app/pages/login/index.vue

@@ -188,7 +188,15 @@
 			this.isCode = needCode
 			this.changeCode()
 			this.getLoginConfig()
+			const userName = uni.getStorageSync('userName');
+			const userPsw = uni.getStorageSync('userPsw');
+			if(userName && userPsw){
+				this.formData.account = userName;
+				this.formData.password = userPsw;
+			}else{
+				this.formData.account = '';
 				this.formData.password = '';
+			}
 			if (options.data) {
 				this.tenantUserInfo = JSON.parse(options.data)
 				if (this.tenantUserInfo) this.show = true
@@ -444,6 +452,8 @@
 							let token = res.data.token
 							this.$store.commit('user/SET_TOKEN', token)
 							uni.setStorageSync('token', token)
+							uni.setStorageSync("userName",this.formData.account)
+							uni.setStorageSync("userPsw",this.formData.password)
 							this.$store.dispatch('user/getCurrentUser').then((res) => {
 								this.loading = false
 								uni.switchTab({

jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/BusinessOrderServiceImpl.java

@@ -332,6 +332,13 @@ public class BusinessOrderServiceImpl extends ServiceImpl<BusinessOrderMapper, B
                 businessOrderQueryWrapper.eq("d.name",value);
             }
 
+            if(ObjectUtil.isNotEmpty(businessOrderPagination.getContractNo())){
+                businessOrderNum++;
+
+                String value = String.valueOf(businessOrderPagination.getContractNo());
+                businessOrderQueryWrapper.eq("d.contract_no",value);
+            }
+
 
             if(ObjectUtil.isNotEmpty(businessOrderPagination.getDeliveryType())){
                 businessOrderNum++;
@@ -703,6 +710,13 @@ public class BusinessOrderServiceImpl extends ServiceImpl<BusinessOrderMapper, B
 
             }
 
+
+            if(ObjectUtil.isNotEmpty(businessOrderPagination.getContractNo())){
+                businessOrderNum++;
+                String value = String.valueOf(businessOrderPagination.getContractNo());
+                businessOrderQueryWrapper.like("d.contract_no",value);
+            }
+
             if(ObjectUtil.isNotEmpty(businessOrderPagination.getBusinessNum())){
                 businessOrderNum++;
                 String value = String.valueOf(businessOrderPagination.getBusinessNum());

jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/CwsettlementServiceImpl.java

@@ -889,6 +889,16 @@ public class CwsettlementServiceImpl extends ServiceImpl<CwsettlementMapper, Cws
                 generaterSwapUtil.swapDatetime(CwsettlementConstant.getFormData(),cwsettlementForm),CwsettlementForm.class);
         CwsettlementEntity entity = JsonUtil.getJsonToBean(cwsettlementForm, CwsettlementEntity.class);
 
+
+        if (cwsettlementForm.getCwsettlementcontractList()!=null){
+            QueryWrapper<ContractLEntity> contractLEntityQueryWrapper =new QueryWrapper<>();
+            contractLEntityQueryWrapper.lambda().eq(ContractLEntity::getId,cwsettlementForm.getCwsettlementcontractList().get(0).getContractId());
+            List<ContractLEntity> contractLEntityList=contractLService.list(contractLEntityQueryWrapper);
+            if (contractLEntityList!=null && contractLEntityList.size()>0){
+                entity.setBusinessLine(contractLEntityList.get(0).getBusinessId());
+            }
+        }
+
         if(isSave){
             String mainId = id ;
             entity.setCode(generaterSwapUtil.getBillNumber("JSD", false));

jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/WarehousingOutboundServiceImpl.java

@@ -81,6 +81,8 @@ public class WarehousingOutboundServiceImpl extends ServiceImpl<WarehousingOutbo
     private VoucherMapper voucherMapper;
     @Resource
     private WarehousingNotificationMapper warehousingNotificationMapper;
+    @Resource
+    private ContractRelationService contractRelationService;
     @Override
     public List<WarehousingOutboundEntity> getList(WarehousingOutboundPagination warehousingOutboundPagination){
         return getTypeList(warehousingOutboundPagination,warehousingOutboundPagination.getDataType());
@@ -685,6 +687,8 @@ public class WarehousingOutboundServiceImpl extends ServiceImpl<WarehousingOutbo
         DeliveryOrderEntity deliveryOrder = deliveryOrderService.getInfo(deliveryOrderForm.getId());
         UserInfo userInfo=userProvider.get();
         UserEntity userEntity = generaterSwapUtil.getUser(userInfo.getUserId());
+        String contractSale=null;
+
 //        warehousingOutboundForm = JsonUtil.getJsonToBean(
 //                generaterSwapUtil.swapDatetime(WarehousingOutboundConstant.getFormData(),warehousingOutboundForm),WarehousingOutboundForm.class);
 //        WarehousingOutboundEntity entity = JsonUtil.getJsonToBean(warehousingOutboundForm, WarehousingOutboundEntity.class);
@@ -698,6 +702,7 @@ public class WarehousingOutboundServiceImpl extends ServiceImpl<WarehousingOutbo
             BusinessOrderEntity businessOrderEntity = businessOrderService.getInfo(deliveryOrderForm.getBusinessId());
             if (ObjectUtil.isNotEmpty(businessOrderEntity)){
                 entity.setBusinessOrderNo(businessOrderEntity.getCode()); //添加销售订单编号
+                contractSale=businessOrderEntity.getContractId();
             }
         }
         entity.setWarehousingOutboundStatus("3");//已出库
@@ -759,7 +764,7 @@ public class WarehousingOutboundServiceImpl extends ServiceImpl<WarehousingOutbo
                 if(inventoryList != null && inventoryList.size() > 0){
                     inventoryEntity = inventoryList.get(0);
                     inventoryEntity.setInventoryNumber(inventoryEntity.getInventoryNumber().subtract((entitys.getDeliveryNum())));//库存数量
-
+                    inventoryEntity.setContractSaleId(contractSale);
                     if (deliveryType.equals("1")) {
                         inventoryEntity.setPurchasePrice(entitys.getReturnUnit());//平均采购单价
                     }else if (deliveryType.equals("2")){
@@ -783,6 +788,8 @@ public class WarehousingOutboundServiceImpl extends ServiceImpl<WarehousingOutbo
                     inventoryEntity.setOrganizeJsonId(deliveryOrder.getOrganizeJsonId());
                     inventoryEntity.setCompanyId(deliveryOrder.getCompanyId());
                     inventoryEntity.setDepartmentId(deliveryOrder.getDepartmentId());
+                    inventoryEntity.setContractSaleId(contractSale);
+
                     if (deliveryType.equals("1")) {
                         inventoryEntity.setPurchasePrice(entitys.getReturnUnit());//平均采购单价
                     }else if (deliveryType.equals("2")){
@@ -792,6 +799,19 @@ public class WarehousingOutboundServiceImpl extends ServiceImpl<WarehousingOutbo
                 }
                 inventoryService.saveOrUpdate(inventoryEntity);
 
+                QueryWrapper<ContractRelationEntity> contractRelationQueryWrapper = new QueryWrapper<>();
+                contractRelationQueryWrapper.lambda().eq(ContractRelationEntity::getBusinessId, contractSale); //销售合同ud
+                contractRelationQueryWrapper.lambda().eq(ContractRelationEntity::getBusinessIds, inventoryEntity.getContractPurchaseId()); //采购合同id
+                List<ContractRelationEntity> contractRelationEntityList = contractRelationService.list(contractRelationQueryWrapper);
+                if(contractRelationEntityList != null && contractRelationEntityList.size() > 0){
+                    //查询到则不做处理
+                }else {
+                    ContractRelationEntity contractRelationEntity = new ContractRelationEntity();
+                    contractRelationEntity.setBusinessId(contractSale);//合同主表id
+                    contractRelationEntity.setBusinessIds(inventoryEntity.getContractPurchaseId()); //合同对应id
+                    contractRelationService.saveOrUpdate(contractRelationEntity);
+                }
+
                 //更新库存流水
                 InventoryLogEntity inventoryLogEntity = new InventoryLogEntity();
                 inventoryLogEntity.setProductId(entitys.getProductId());

jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/WarehousingStorageServiceImpl.java

@@ -749,11 +749,13 @@ public class WarehousingStorageServiceImpl extends ServiceImpl<WarehousingStorag
 //        WarehousingStorageEntity entity = JsonUtil.getJsonToBean(receiptOrderForm, WarehousingStorageEntity.class);
         WarehousingStorageEntity entity = new WarehousingStorageEntity();
         entity.setDocumentNo(generaterSwapUtil.getBillNumber("rukudanbianhao", false));
+        String contractPurchase=null;
         if (receiptType.equals("1")) {
             entity.setWarehousingStorageType("15");//采购收货单入库
             BusinessOrderEntity businessOrderEntity = businessOrderService.getInfo(receiptOrderForm.getBusinessId());
             if (ObjectUtil.isNotEmpty(businessOrderEntity)){
                 entity.setBusinessOrderNo(businessOrderEntity.getCode()); //添加采购订单编号
+                contractPurchase=businessOrderEntity.getContractId();
             }
         }else if (receiptType.equals("2")){
             entity.setWarehousingStorageType("16");//销售收货单入库
@@ -816,6 +818,8 @@ public class WarehousingStorageServiceImpl extends ServiceImpl<WarehousingStorag
                     inventoryEntity = inventoryList.get(0);
                     inventoryEntity.setInventoryNumber(inventoryEntity.getInventoryNumber().add((entitys.getDeliveryNum())));//库存数量
                     inventoryEntity.setSpec(entitys.getSpec());
+                    inventoryEntity.setContractPurchaseId(contractPurchase);
+
                 }else{
                     inventoryEntity.setProductId(entitys.getProductId());
                     inventoryEntity.setCode(productWarehouseEntity.getCode());
@@ -824,7 +828,6 @@ public class WarehousingStorageServiceImpl extends ServiceImpl<WarehousingStorag
                     inventoryEntity.setPhoto(productWarehouseEntity.getPhoto());
                     inventoryEntity.setBrandId(productWarehouseEntity.getBrandId());
                     inventoryEntity.setProductTypeId(productWarehouseEntity.getProductTypeId());
-                    inventoryEntity.setSpec(productWarehouseEntity.getSpec());
                     inventoryEntity.setInventoryUnitId(productWarehouseEntity.getInventoryUnitId());
                     inventoryEntity.setWarehouseId(entity.getWarehouseId());
                     inventoryEntity.setStorageAreaId(entitys.getCargoId());
@@ -834,7 +837,7 @@ public class WarehousingStorageServiceImpl extends ServiceImpl<WarehousingStorag
                     inventoryEntity.setOrganizeJsonId(receiptOrder.getOrganizeJsonId());
                     inventoryEntity.setCompanyId(receiptOrder.getCompanyId());
                     inventoryEntity.setDepartmentId(receiptOrder.getDepartmentId());
-
+                    inventoryEntity.setContractPurchaseId(contractPurchase);
                     if (receiptType.equals("1")) {
                     inventoryEntity.setPurchasePrice(entitys.getReturnUnit());//平均采购单价
                     }else if (receiptType.equals("2")){

jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WarehousingInventoryController.java

@@ -546,6 +546,20 @@ public class WarehousingInventoryController {
                                         inventoryEntity.setInventoryNumber(frim);//库存数量
                                     }
                                     inventoryService.saveOrUpdate(inventoryEntity);
+                                } else {
+                                    //更新库存
+                                    //根据商品id和批次号查询库存信息
+                                    QueryWrapper<InventoryEntity> inventoryQueryWrapper = new QueryWrapper<>();
+                                    inventoryQueryWrapper.lambda().eq(InventoryEntity::getProductId, warehousingInventoryProductModel.getProductId());
+                                    inventoryQueryWrapper.lambda().eq(InventoryEntity::getBatchNumber, warehousingInventoryProductModel.getBatchNumber());
+                                    List<InventoryEntity> inventoryList = inventoryService.list(inventoryQueryWrapper);
+                                    InventoryEntity inventoryEntity = new InventoryEntity();
+                                    if(inventoryList != null && inventoryList.size() > 0){
+                                        inventoryEntity = inventoryList.get(0);
+                                        BigDecimal frim =new BigDecimal(warehousingInventoryProductModel.getFirmOfferQuantity());
+                                        inventoryEntity.setInventoryNumber(frim);//库存数量
+                                    }
+                                    inventoryService.saveOrUpdate(inventoryEntity);
                                 }
 
                             }

jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ContractRelationEntity.java

@@ -18,6 +18,8 @@ public class ContractRelationEntity  {
     private String id;
     @TableField(value = "BUSINESS_ID" , updateStrategy = FieldStrategy.IGNORED)
     private String businessId;
+    @TableField(value = "BUSINESS_IDS" , updateStrategy = FieldStrategy.IGNORED)
+    private String businessIds;
     @TableField("PURCHASE_CONTRACT_CODE")
     private String purchaseContractCode;
     @TableField("PURCHASE_CONTRACT_NAME")

jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/CwsettlementEntity.java

@@ -176,4 +176,6 @@ public class CwsettlementEntity  {
     private String applyState;
     @TableField(exist = false)
     private String contractName;
+    @TableField(value = "BUSINESS_LINE" , updateStrategy = FieldStrategy.IGNORED)
+    private String businessLine;
 }

jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/InventoryEntity.java

@@ -41,6 +41,10 @@ public class InventoryEntity  {
     private String storageAreaId;
     @TableField(value = "BATCH_NUMBER" , updateStrategy = FieldStrategy.IGNORED)
     private String batchNumber;
+    @TableField(value = "CONTRACT_PURCHASE_ID" , updateStrategy = FieldStrategy.IGNORED)
+    private String contractPurchaseId;
+    @TableField(value = "CONTRACT_SALE_ID" , updateStrategy = FieldStrategy.IGNORED)
+    private String contractSaleId;
     @TableField(value = "INVENTORY_NUMBER" , updateStrategy = FieldStrategy.IGNORED)
     private BigDecimal inventoryNumber;
     @TableField(value = "PURCHASE_PRICE" , updateStrategy = FieldStrategy.IGNORED)

jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/contractl/ContractRelationModel.java

@@ -17,6 +17,10 @@ public class ContractRelationModel {
     @JSONField(name = "businessId")
     private Object businessId;
 
+    /** 主表id **/
+    @JSONField(name = "businessIds")
+    private Object businessIds;
+
     /** 合同编码 **/
     @JSONField(name = "purchaseContractCode")
     private Object purchaseContractCode;

jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/cwsettlement/CwsettlementForm.java

@@ -170,4 +170,7 @@ public class CwsettlementForm  {
     private BigDecimal settlementSum;
     @JsonProperty("applyState")
     private String applyState;
+
+    @JsonProperty("businessLine")
+    private String businessLine;
 }

jnpf-java-boot/jnpf-web/src/views/scm/contractLRelation/formContractBatch.vue

@@ -178,6 +178,18 @@
                     </template>
                   </el-table-column>
 
+                  <!-- <el-table-column label="1" prop="buinessIds">
+                    <template slot="header" v-if="false">
+                      <span class="required-sign">*</span>1
+                    </template>
+                    <template slot-scope="scope">
+                      <JnpfInput v-model="scope.row.buinessIds"
+                        @change="changeData('voucherproduct-remark',scope.$index)" placeholder="请输入"
+                        clearable :style='{"width":"100%"}'>
+                      </JnpfInput>
+                    </template>
+                  </el-table-column> -->
+
                   <el-table-column label="操作" width="50">
                     <template slot-scope="scope">
                       <el-button size="mini" type="text" class="JNPF-table-delBtn"
@@ -406,6 +418,8 @@ export default {
           purchaseContractCode: e.contractNumber,
           purchaseContractName: e.contractName,
           purchaseContractNo: e.contractNo,
+          buinessIds: e.id,
+
         }
         this.dataForm.contractRelationList.push(item)
       }

jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/receiptOrder/form.vue

@@ -1789,7 +1789,7 @@ export default {
       );
     },
     getPurchaseOrder(val, val2) {
-      // if (val2.erpMark != '200') {
+      // if (val2.yunguanMark != 'Y') {
       //   this.dataForm.businessId = undefined
       //   this.$message({
       //     message: '运管暂未返回正常订单状态',

jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/deliveryOrder/form.vue

@@ -1732,7 +1732,7 @@ export default {
       );
     },
     getSaleOrder(val, val2) {
-      // if (val2.erpMark != '200') {
+      // if (val2.yunguanMark != 'Y') {
       //   this.dataForm.businessId = undefined
       //   this.$message({
       //     message: '运管暂未返回正常订单状态',

jnpf-java-boot/jnpf-web/src/views/workFlow/flowLaunch/index.vue

@@ -99,6 +99,7 @@
               {{scope.row.fullName}}
             </template>
           </el-table-column>
+          <el-table-column prop="netWeight" label="重量" width="130" />
           <el-table-column prop="flowName" label="所属流程" width="130" />
           <el-table-column prop="startTime" label="发起时间" width="130"
             :formatter="jnpf.tableDateFormat" />

jnpf-java-boot/jnpf-workflow/jnpf-workflow-engine/jnpf-workflow-engine-controller/src/main/java/jnpf/engine/controller/FlowLaunchController.java

@@ -10,19 +10,24 @@ import jnpf.base.vo.PageListVO;
 import jnpf.base.vo.PaginationVO;
 import jnpf.constant.MsgCode;
 import jnpf.engine.entity.FlowTaskEntity;
+import jnpf.engine.model.flowbefore.FlowBeforeListVO;
 import jnpf.engine.model.flowengine.FlowModel;
+import jnpf.engine.model.flowengine.shuntjson.nodejson.ChildNodeList;
 import jnpf.engine.model.flowlaunch.FlowLaunchListVO;
 import jnpf.engine.model.flowtask.PaginationFlowTask;
 import jnpf.engine.service.FlowTaskNewService;
 import jnpf.engine.service.FlowTaskService;
 import jnpf.engine.util.FlowNature;
 import jnpf.exception.WorkFlowException;
+import jnpf.permission.entity.UserEntity;
 import jnpf.util.JsonUtil;
 import jnpf.util.StringUtil;
 import jnpf.util.UserProvider;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.math.BigDecimal;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 
@@ -56,9 +61,39 @@ public class FlowLaunchController {
     @GetMapping
     public ActionResult<PageListVO<FlowLaunchListVO>> list(PaginationFlowTask paginationFlowTask) {
         List<FlowTaskEntity> list = flowTaskService.getLaunchList(paginationFlowTask);
+//        for (FlowTaskEntity flowTaskEntity : list){
+//            FlowTaskEntity vo = JsonUtil.getJsonToBean(flowTaskEntity, FlowTaskEntity.class);
+//            if (vo.getFlowName().equals("采购订单") || vo.getFlowName().equals("销售订单") || vo.getFlowName().equals("采购收货单") || vo.getFlowName().equals("销售发货单")|| vo.getFlowName().equals("销售发货单")){
+//                BigDecimal netWeight = flowTaskService.getNetWeight(vo.getFlowName(),vo.getProcessId());
+//                vo.setNetWeight(netWeight);
+//            }
+//            if ( vo.getFlowName().equals("付款申请单")){
+//                BigDecimal netWeight = flowTaskService.getNetWeightPayment(vo.getFlowName(),vo.getProcessId());
+//                vo.setNetWeight(netWeight);
+//            }
+//
+//        }
         List<FlowLaunchListVO> listVO = JsonUtil.getJsonToList(list, FlowLaunchListVO.class);
+
+        List<FlowLaunchListVO> listVO1 = new ArrayList<>();
+
+
+        for (FlowLaunchListVO launchListVO : listVO){
+            FlowLaunchListVO vo = JsonUtil.getJsonToBean(launchListVO, FlowLaunchListVO.class);
+            if (vo.getFlowName().equals("采购订单") || vo.getFlowName().equals("销售订单") || vo.getFlowName().equals("采购收货单") || vo.getFlowName().equals("销售发货单")|| vo.getFlowName().equals("销售发货单")){
+                BigDecimal netWeight = flowTaskService.getNetWeight(vo.getFlowName(),vo.getId());
+                vo.setNetWeight(netWeight);
+            }
+            if ( vo.getFlowName().equals("付款申请单")){
+                BigDecimal netWeight = flowTaskService.getNetWeightPayment(vo.getFlowName(),vo.getId());
+                vo.setNetWeight(netWeight);
+            }
+            listVO1.add(vo);
+        }
         PaginationVO paginationVO = JsonUtil.getJsonToBean(paginationFlowTask, PaginationVO.class);
-        return ActionResult.page(listVO, paginationVO);
+//        return ActionResult.page(listVO, paginationVO);
+        return ActionResult.page(listVO1, paginationVO);
+
     }
 
     /**

jnpf-java-boot/jnpf-workflow/jnpf-workflow-engine/jnpf-workflow-engine-entity/src/main/java/jnpf/engine/entity/FlowTaskEntity.java

@@ -7,6 +7,7 @@ import jnpf.base.entity.SuperExtendEntity;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.util.Date;
 
 /**
@@ -189,4 +190,10 @@ public class FlowTaskEntity extends SuperExtendEntity.SuperExtendDEEntity<String
     @TableField(value = "F_REJECT_DATA_ID", fill = FieldFill.UPDATE)
     private String rejectId;
 
+
+
+    @TableField(exist = false)
+    private BigDecimal netWeight;
+
+
 }

jnpf-java-boot/jnpf-workflow/jnpf-workflow-engine/jnpf-workflow-engine-entity/src/main/java/jnpf/engine/model/flowlaunch/FlowLaunchListVO.java

@@ -2,6 +2,8 @@ package jnpf.engine.model.flowlaunch;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
+import java.math.BigDecimal;
+
 /**
  *
  *
@@ -53,4 +55,9 @@ public class FlowLaunchListVO {
     @Schema(description ="委托用户")
     private String delegateUser;
 
+    @Schema(description ="重量")
+    private BigDecimal netWeight;
+
+
+
 }