安品业务

ruoyi-anpin/src/main/java/com/ruoyi/anpin/service/impl/TProjectServiceImpl.java

@@ -296,6 +296,9 @@ public class TProjectServiceImpl implements ITProjectService {
     @Override
     public String selectprojectfNumber(TProject tProject) {
         TProject project = tProjectMapper.selectprojectfNumber(tProject);
+        if (tProject.getfId() == null && StringUtils.isNotNull(project)){
+            return UserConstants.NOT_UNIQUE;
+        }
         if (StringUtils.isNotNull(project) && !project.getfId().equals(tProject.getfId())) {
             return UserConstants.NOT_UNIQUE;
         }
@@ -305,6 +308,9 @@ public class TProjectServiceImpl implements ITProjectService {
     @Override
     public String selectprojectfName(TProject tProject) {
         TProject project = tProjectMapper.selectprojectfName(tProject);
+        if (tProject.getfId() == null && StringUtils.isNotNull(project)){
+            return UserConstants.NOT_UNIQUE;
+        }
         if (StringUtils.isNotNull(project) && !project.getfId().equals(tProject.getfId())) {
             return UserConstants.NOT_UNIQUE;
         }

ruoyi-fleet/src/main/java/com/ruoyi/basicData/service/impl/FleetCompanyMsgServiceImpl.java

@@ -235,6 +235,9 @@ public class FleetCompanyMsgServiceImpl implements IFleetCompanyMsgService {
     @Override
     public String checkUFNoUnique(FleetCompanyMsg fleetCompanyMsg) {
         FleetCompanyMsg fleetCompanyMsg1 = fleetCompanyMsgMapper.checkFNoUnique(fleetCompanyMsg.getCompanyName());
+        if (fleetCompanyMsg.getId() == null && StringUtils.isNotNull(fleetCompanyMsg1)){
+            return UserConstants.NOT_UNIQUE;
+        }
         if (StringUtils.isNotNull(fleetCompanyMsg1) && fleetCompanyMsg1.getId() != fleetCompanyMsg.getId()) {
             return UserConstants.NOT_UNIQUE;
         }

ruoyi-shipping/src/main/java/com/ruoyi/shipping/service/impl/TAddressServiceImpl.java

@@ -169,6 +169,9 @@ public class TAddressServiceImpl implements ITAddressService
     @Override
     public String selectAddressFno(TAddress tAddress) {
         TAddress address = tAddressMapper.selectAddressFno(tAddress);
+        if (tAddress.getfId() == null && StringUtils.isNotNull(address)){
+            return UserConstants.NOT_UNIQUE;
+        }
         if (StringUtils.isNotNull(address) && !address.getfId().equals(tAddress.getfId())) {
             return UserConstants.NOT_UNIQUE;
         }
@@ -178,6 +181,9 @@ public class TAddressServiceImpl implements ITAddressService
     @Override
     public String selectAddressFName(TAddress tAddress) {
         TAddress address = tAddressMapper.selectAddressFName(tAddress);
+        if (tAddress.getfId() == null && StringUtils.isNotNull(address)){
+            return UserConstants.NOT_UNIQUE;
+        }
         if (StringUtils.isNotNull(address) && !address.getfId().equals(tAddress.getfId())) {
             return UserConstants.NOT_UNIQUE;
         }

ruoyi-shipping/src/main/java/com/ruoyi/shipping/service/impl/TCntrServiceImpl.java

@@ -109,6 +109,9 @@ public class TCntrServiceImpl implements ITCntrService
     @Override
     public String selectTcnrFno(TCntr tCntr) {
         TCntr cntr = tCntrMapper.selectTcnrFno(tCntr.getfNo());
+        if (tCntr.getfId() == null && StringUtils.isNotNull(cntr)){
+            return UserConstants.NOT_UNIQUE;
+        }
         if (StringUtils.isNotNull(cntr) && !cntr.getfId().equals(tCntr.getfId())) {
             return UserConstants.NOT_UNIQUE;
         }
@@ -118,6 +121,9 @@ public class TCntrServiceImpl implements ITCntrService
     @Override
     public String selectTcnrFName(TCntr tCntr) {
         TCntr cntr = tCntrMapper.selectTcnrFName(tCntr.getfName());
+        if (tCntr.getfId() == null && StringUtils.isNotNull(cntr)){
+            return UserConstants.NOT_UNIQUE;
+        }
         if (StringUtils.isNotNull(cntr) && !cntr.getfId().equals(tCntr.getfId())) {
             return UserConstants.NOT_UNIQUE;
         }

ruoyi-shipping/src/main/java/com/ruoyi/shipping/service/impl/TCntrnoServiceImpl.java

@@ -267,6 +267,9 @@ public class TCntrnoServiceImpl implements ITCntrnoService
     @Override
     public String selectTCntrnoFNo(TCntrno tCntrno) {
         TCntrno cntrno = tCntrnoMapper.selectTCntrnoFNo(tCntrno);
+        if (tCntrno.getfId() == null && StringUtils.isNotNull(cntrno)){
+            return UserConstants.NOT_UNIQUE;
+        }
         if (StringUtils.isNotNull(cntrno) && !cntrno.getfId().equals(tCntrno.getfId())) {
             return UserConstants.NOT_UNIQUE;
         }

ruoyi-shipping/src/main/java/com/ruoyi/shipping/service/impl/TVesselServiceImpl.java

@@ -104,6 +104,9 @@ public class TVesselServiceImpl implements ITVesselService
     @Override
     public String selectTVesselfNo(TVessel tVessel) {
         TVessel vessel = tVesselMapper.selectTVesselfNo(tVessel);
+        if (tVessel.getfId() == null && StringUtils.isNotNull(vessel)){
+            return UserConstants.NOT_UNIQUE;
+        }
         if (StringUtils.isNotNull(vessel) && !vessel.getfId().equals(vessel.getfId())) {
             return UserConstants.NOT_UNIQUE;
         }
@@ -113,6 +116,9 @@ public class TVesselServiceImpl implements ITVesselService
     @Override
     public String selectTVesselfName(TVessel tVessel) {
         TVessel vessel = tVesselMapper.selectTVesselfName(tVessel);
+        if (tVessel.getfId() == null && StringUtils.isNotNull(vessel)){
+            return UserConstants.NOT_UNIQUE;
+        }
         if (StringUtils.isNotNull(vessel) && !vessel.getfId().equals(vessel.getfId())) {
             return UserConstants.NOT_UNIQUE;
         }
@@ -122,6 +128,9 @@ public class TVesselServiceImpl implements ITVesselService
     @Override
     public String selectTVesselfEname(TVessel tVessel) {
         TVessel vessel = tVesselMapper.selectTVesselfEname(tVessel);
+        if (tVessel.getfId() == null && StringUtils.isNotNull(vessel)){
+            return UserConstants.NOT_UNIQUE;
+        }
         if (StringUtils.isNotNull(vessel) && !vessel.getfId().equals(vessel.getfId())) {
             return UserConstants.NOT_UNIQUE;
         }
@@ -131,6 +140,9 @@ public class TVesselServiceImpl implements ITVesselService
     @Override
     public String selectTVesselfImo(TVessel tVessel) {
         TVessel vessel = tVesselMapper.selectTVesselfImo(tVessel);
+        if (tVessel.getfId() == null && StringUtils.isNotNull(vessel)){
+            return UserConstants.NOT_UNIQUE;
+        }
         if (StringUtils.isNotNull(vessel) && !vessel.getfId().equals(vessel.getfId())) {
             return UserConstants.NOT_UNIQUE;
         }

ruoyi-shipping/src/main/java/com/ruoyi/shipping/service/impl/TVoyageServiceImpl.java

@@ -247,6 +247,9 @@ public class TVoyageServiceImpl implements ITVoyageService
     @Override
     public String selectTVoyagefNo(TVoyage tVoyage) {
         TVoyage voyage = tVoyageMapper.selectTVoyagefNo(tVoyage);
+        if (tVoyage.getfId() == null && StringUtils.isNotNull(voyage)){
+            return UserConstants.NOT_UNIQUE;
+        }
         if (StringUtils.isNotNull(voyage) && !voyage.getfId().equals(voyage.getfId())) {
             return UserConstants.NOT_UNIQUE;
         }

ruoyi-warehouse/src/main/java/com/ruoyi/basicData/service/impl/TCorpsServiceImpl.java

@@ -312,6 +312,9 @@ public class TCorpsServiceImpl implements ITCorpsService {
     @Override
     public String checkUFNoUnique(TCorps tCorps) {
         TCorps tCorps1 = tCorpsMapper.checkFNoUnique(tCorps.getfNo());
+        if (tCorps.getfId() == null && StringUtils.isNotNull(tCorps1)){
+            return UserConstants.NOT_UNIQUE;
+        }
         if (StringUtils.isNotNull(tCorps1) && !tCorps1.getfId().equals(tCorps.getfId())) {
             return UserConstants.NOT_UNIQUE;
         }
@@ -321,6 +324,9 @@ public class TCorpsServiceImpl implements ITCorpsService {
     @Override
     public String checkUFNnameUnique(TCorps tCorps) {
         TCorps tCorps1 = tCorpsMapper.checkUFNnameUnique(tCorps.getfName());
+        if (tCorps.getfId() == null && StringUtils.isNotNull(tCorps1)){
+            return UserConstants.NOT_UNIQUE;
+        }
         if (StringUtils.isNotNull(tCorps1) && !tCorps1.getfId().equals(tCorps.getfId())) {
             return UserConstants.NOT_UNIQUE;
         }
@@ -330,6 +336,9 @@ public class TCorpsServiceImpl implements ITCorpsService {
     @Override
     public String checkUFCnameUnique(TCorps tCorps) {
         TCorps tCorps1 = tCorpsMapper.checkUFCnameUnique(tCorps.getfCname());
+        if (tCorps.getfId() == null && StringUtils.isNotNull(tCorps1)){
+            return UserConstants.NOT_UNIQUE;
+        }
         if (StringUtils.isNotNull(tCorps1) && !tCorps1.getfId().equals(tCorps.getfId())) {
             return UserConstants.NOT_UNIQUE;
         }
@@ -339,6 +348,9 @@ public class TCorpsServiceImpl implements ITCorpsService {
     @Override
     public String checkULoginAccountUnique(TCorps tCorps) {
         TCorps corps = tCorpsMapper.checkULoginAccountUnique(tCorps.getLoginAccount());
+        if (tCorps.getfId() == null && StringUtils.isNotNull(corps)){
+            return UserConstants.NOT_UNIQUE;
+        }
         if (StringUtils.isNotNull(corps) && !corps.getfId().equals(tCorps.getfId())) {
             return UserConstants.NOT_UNIQUE;
         }

ruoyi-warehouse/src/main/java/com/ruoyi/basicData/service/impl/TFeesServiceImpl.java

@@ -129,6 +129,9 @@ public class TFeesServiceImpl implements ITFeesService {
     @Override
     public String checkUFNoUnique(TFees tFees) {
         TFees tFees1= tFeesMapper.checkFNoUnique(tFees.getfNo());
+        if (tFees.getfId() == null && StringUtils.isNotNull(tFees1)){
+            return UserConstants.NOT_UNIQUE;
+        }
         if (StringUtils.isNotNull(tFees1) && tFees1.getfId().longValue()!=tFees.getfId().longValue()) {
             return UserConstants.NOT_UNIQUE;
         }
@@ -138,7 +141,10 @@ public class TFeesServiceImpl implements ITFeesService {
     @Override
     public String checkUFNnameUnique(TFees tFees) {
         TFees tFees1 = tFeesMapper.checkUFNnameUnique(tFees.getfName());
-        if (StringUtils.isNotNull(tFees1) && tFees1.getfId().longValue()!=tFees.getfId().longValue()) {
+        if (StringUtils.isNotNull(tFees1) && tFees.getfId() == null){
+            return UserConstants.NOT_UNIQUE;
+        }
+        if (StringUtils.isNotNull(tFees1) && tFees1.getfId().longValue()!=tFees.getfId().longValue() ) {
             return UserConstants.NOT_UNIQUE;
         }
         return UserConstants.UNIQUE;

ruoyi-warehouse/src/main/java/com/ruoyi/basicData/service/impl/TGoodsServiceImpl.java

@@ -126,6 +126,9 @@ public class TGoodsServiceImpl implements ITGoodsService {
     @Override
     public String checkUFNoUnique(TGoods tGoods) {
         TGoods tGoods1 = tGoodsMapper.checkFNoUnique(tGoods.getfNo());
+        if (tGoods.getfId() == null && StringUtils.isNotNull(tGoods1)){
+            return UserConstants.NOT_UNIQUE;
+        }
         if (StringUtils.isNotNull(tGoods1) && tGoods1.getfId()!=tGoods.getfId()) {
             return UserConstants.NOT_UNIQUE;
         }
@@ -135,6 +138,9 @@ public class TGoodsServiceImpl implements ITGoodsService {
     @Override
     public String checkUFNnameUnique(TGoods tGoods) {
         TGoods tGoods1 = tGoodsMapper.checkUFNnameUnique(tGoods.getfName());
+        if (tGoods.getfId() == null && StringUtils.isNotNull(tGoods1)){
+            return UserConstants.NOT_UNIQUE;
+        }
         if (StringUtils.isNotNull(tGoods1) && tGoods1.getfId()!=tGoods.getfId()) {
             return UserConstants.NOT_UNIQUE;
         }

ruoyi-warehouse/src/main/java/com/ruoyi/basicData/service/impl/TWarehouseServiceImpl.java

@@ -325,6 +325,9 @@ public class TWarehouseServiceImpl implements ITWarehouseService {
     @Override
     public String checkUFNoUnique(TWarehouse tWarehouse) {
         TWarehouse tWarehouse1 = tWarehouseMapper.checkFNoUnique(tWarehouse.getfNo());
+        if (tWarehouse.getfId() == null && StringUtils.isNotNull(tWarehouse1)){
+            return UserConstants.NOT_UNIQUE;
+        }
         if (StringUtils.isNotNull(tWarehouse1) && tWarehouse1.getfId()!=tWarehouse.getfId()) {
             return UserConstants.NOT_UNIQUE;
         }
@@ -334,6 +337,9 @@ public class TWarehouseServiceImpl implements ITWarehouseService {
     @Override
     public String checkUFNnameUnique(TWarehouse tWarehouse) {
         TWarehouse tWarehouse1 = tWarehouseMapper.checkUFNnameUnique(tWarehouse.getfName());
+        if (tWarehouse.getfId() == null && StringUtils.isNotNull(tWarehouse1)){
+            return UserConstants.NOT_UNIQUE;
+        }
         if (StringUtils.isNotNull(tWarehouse1) && tWarehouse1.getfId()!=tWarehouse.getfId()) {
             return UserConstants.NOT_UNIQUE;
         }
@@ -343,6 +349,9 @@ public class TWarehouseServiceImpl implements ITWarehouseService {
     @Override
     public String checkUFAaddrUnique(TWarehouse tWarehouse) {
         TWarehouse tWarehouse1 = tWarehouseMapper.checkUFAaddrUnique(tWarehouse.getfAddr());
+        if (tWarehouse.getfId() == null && StringUtils.isNotNull(tWarehouse1)){
+            return UserConstants.NOT_UNIQUE;
+        }
         if (StringUtils.isNotNull(tWarehouse1) && tWarehouse1.getfId()!=tWarehouse.getfId()) {
             return UserConstants.NOT_UNIQUE;
         }
@@ -352,6 +361,9 @@ public class TWarehouseServiceImpl implements ITWarehouseService {
     @Override
     public String checkUFTWarehouseAreaNoUnique(TWarehouseArea tWarehouseAreas) {
         TWarehouseArea tWarehouseAreas1 = tWarehouseAreaMapper.checkFNoUnique(tWarehouseAreas.getfNo(),tWarehouseAreas.getfWarehouseid());
+        if (tWarehouseAreas.getfId() == null && StringUtils.isNotNull(tWarehouseAreas1)){
+            return UserConstants.NOT_UNIQUE;
+        }
         if (StringUtils.isNotNull(tWarehouseAreas1) && tWarehouseAreas1.getfId()!=tWarehouseAreas.getfId()) {
             return UserConstants.NOT_UNIQUE;
         }
@@ -361,6 +373,9 @@ public class TWarehouseServiceImpl implements ITWarehouseService {
     @Override
     public String checkUTWarehouseAreaFNnameUnique(TWarehouseArea tWarehouseAreas) {
         TWarehouseArea tWarehouseAreas1 = tWarehouseAreaMapper.checkUFNnameUnique(tWarehouseAreas.getfName(),tWarehouseAreas.getfWarehouseid());
+        if (tWarehouseAreas.getfId() == null && StringUtils.isNotNull(tWarehouseAreas1)){
+            return UserConstants.NOT_UNIQUE;
+        }
         if (StringUtils.isNotNull(tWarehouseAreas1) && tWarehouseAreas1.getfId()!=tWarehouseAreas.getfId()) {
             return UserConstants.NOT_UNIQUE;
         }

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/domain/TWarehouseBills.java

@@ -598,11 +598,31 @@ public class TWarehouseBills extends BaseEntity {
     private String feeName;
     //物资类别
     private Long fFeeType;
+    //物资类别
+    private List<Long> fFeeTypeList;
+    //是否按照日期分组
+    private Long groupDate;
     //年
     private String annual;
     //开始结束月
     private List<Long> monthList;
 
+    public List<Long> getfFeeTypeList() {
+        return fFeeTypeList;
+    }
+
+    public void setfFeeTypeList(List<Long> fFeeTypeList) {
+        this.fFeeTypeList = fFeeTypeList;
+    }
+
+    public Long getGroupDate() {
+        return groupDate;
+    }
+
+    public void setGroupDate(Long groupDate) {
+        this.groupDate = groupDate;
+    }
+
     public String getAnnual() {
         return annual;
     }

ruoyi-warehouse/src/main/resources/mapper/warehouseBusiness/TWarehousebillsfeesMapper.xml

@@ -1076,8 +1076,10 @@
         sc.dict_label AS ffeeunitidName,/*计价单位中文名*/
         td.fqty AS fqty,/*数量*/
         td.famount AS famount,/*金额*/
-        round(td.price,2) AS price,/*单价*/
-        td.fBsdate AS fBsdate/*入库日期*/
+        round(td.price,2) AS price/*单价*/
+        <if test="groupDate != null  and groupDate == 0">
+            ,td.fBsdate AS fBsdate/*入库日期*/
+        </if>
         FROM
         (
         SELECT
@@ -1117,8 +1119,11 @@
         AND tw.f_billtype = 'XS'
         <if test="fBillstatus != null">and tw.f_billstatus = #{fBillstatus}</if>
         <if test="fGoodsid != null  and fGoodsid != ''">and tb.f_goodsid = #{fGoodsid}</if>
-        <if test="fFeeid != null">and tw.f_feeid = #{fFeeid}</if>
-        <if test="fFeeType != null ">and tf.f_feetype = #{fFeeType}</if>
+        <if test="fFeeTypeList != null and fFeeTypeList != '[]'">and tf.f_feetype in
+            <foreach item="fId" collection="fFeeTypeList" open="(" separator="," close=")">
+                #{fId}
+            </foreach>
+        </if>
         <if test='cLoadDate != null and cLoadDate[0] != null and cLoadDate[0]!= ""'>
             and tb.f_bsdate &gt;= #{cLoadDate[0]}
         </if>
@@ -1131,13 +1136,18 @@
         tc.ffeetype,
         tc.fname,
         tc.fcurrency,
-        tc.ffeeunitid,
-        tc.fBsdate
+        tc.ffeeunitid
+        <if test="groupDate != null  and groupDate == 0">,tc.fBsdate</if>
+
         ) td
         LEFT JOIN t_project tp ON td.fgoodsid = tp.f_id
         LEFT JOIN sys_dict_data sc ON sc.dict_value = td.ffeeunitid AND sc.dict_type = 'data_unitfees'
         LEFT JOIN sys_dict_data si ON si.dict_value = td.ffeetype AND si.dict_type = 'data_cost_attribute'
-        ORDER BY td.fBsdate DESC, td.fgoodsid DESC
+        ORDER BY
+        <if test="groupDate != null  and groupDate == 0">
+            td.fBsdate DESC,/*入库日期*/
+        </if>
+                  td.fgoodsid DESC
     </select>
     <!--安品利润统计-->
     <select id="salectAnpinProfit" parameterType="TWarehousebills"